Merge branch 'topo' into loopgen-after-readable-order

2016-01-19 16:47:41 -05:00
parent dba2826328 159b59faa7
commit e7f6cac1bd
48 changed files with 7859 additions and 2573 deletions
--- a/Test/baseResults/spv.doWhileLoop.frag.out
+++ b/Test/baseResults/spv.doWhileLoop.frag.out
@@ -51,14 +51,14 @@ Linked fragment stage:
              21:    7(fvec4) FAdd 20 19
                              Store 9(color) 21
                              Branch 16
-              15:             Label
-              34:    7(fvec4) Load 9(color)
-                              Store 33(gl_FragColor) 34
-                              Return
              16:             Label
              25:     24(ptr) AccessChain 9(color) 23
              26:    6(float) Load 25
              29:    6(float) Load 28(d)
              31:    30(bool) FOrdLessThan 26 29
                              BranchConditional 31 13 15
-                                FunctionEnd
+              15:             Label
+              34:    7(fvec4) Load 9(color)
+                              Store 33(gl_FragColor) 34
+                              Return
+                              FunctionEnd