Preserve signedness in SPV image query ops

The AST->SPIRV translation of image queries was dropping signedness,
causing some validation troubles.
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 5385eee..276899c 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -2922,6 +2922,10 @@
     glslang::TCrackedTextureOp cracked;
     node->crackTexture(sampler, cracked);
 
+    const bool isUnsignedResult =
+        node->getType().getBasicType() == glslang::EbtUint64 ||
+        node->getType().getBasicType() == glslang::EbtUint;
+
     // Check for queries
     if (cracked.query) {
         // OpImageQueryLod works on a sampled image, for other queries the image has to be extracted first
@@ -2933,17 +2937,17 @@
         case glslang::EOpTextureQuerySize:
             if (arguments.size() > 1) {
                 params.lod = arguments[1];
-                return builder.createTextureQueryCall(spv::OpImageQuerySizeLod, params);
+                return builder.createTextureQueryCall(spv::OpImageQuerySizeLod, params, isUnsignedResult);
             } else
-                return builder.createTextureQueryCall(spv::OpImageQuerySize, params);
+                return builder.createTextureQueryCall(spv::OpImageQuerySize, params, isUnsignedResult);
         case glslang::EOpImageQuerySamples:
         case glslang::EOpTextureQuerySamples:
-            return builder.createTextureQueryCall(spv::OpImageQuerySamples, params);
+            return builder.createTextureQueryCall(spv::OpImageQuerySamples, params, isUnsignedResult);
         case glslang::EOpTextureQueryLod:
             params.coords = arguments[1];
-            return builder.createTextureQueryCall(spv::OpImageQueryLod, params);
+            return builder.createTextureQueryCall(spv::OpImageQueryLod, params, isUnsignedResult);
         case glslang::EOpTextureQueryLevels:
-            return builder.createTextureQueryCall(spv::OpImageQueryLevels, params);
+            return builder.createTextureQueryCall(spv::OpImageQueryLevels, params, isUnsignedResult);
         case glslang::EOpSparseTexelsResident:
             return builder.createUnaryOp(spv::OpImageSparseTexelsResident, builder.makeBoolType(), arguments[0]);
         default:
diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index f6b0b86..0add1db 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -1662,7 +1662,7 @@
 }
 
 // Comments in header
-Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameters)
+Id Builder::createTextureQueryCall(Op opCode, const TextureParameters& parameters, bool isUnsignedResult)
 {
     // All these need a capability
     addCapability(CapabilityImageQuery);
@@ -1695,10 +1695,12 @@
         }
         if (isArrayedImageType(getImageType(parameters.sampler)))
             ++numComponents;
+
+        Id intType = isUnsignedResult ? makeUintType(32) : makeIntType(32);
         if (numComponents == 1)
-            resultType = makeIntType(32);
+            resultType = intType;
         else
-            resultType = makeVectorType(makeIntType(32), numComponents);
+            resultType = makeVectorType(intType, numComponents);
 
         break;
     }
@@ -1707,7 +1709,7 @@
         break;
     case OpImageQueryLevels:
     case OpImageQuerySamples:
-        resultType = makeIntType(32);
+        resultType = isUnsignedResult ? makeUintType(32) : makeIntType(32);
         break;
     default:
         assert(0);
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
index fe83ac1..204d3e7 100755
--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
@@ -335,7 +335,7 @@
 
     // Emit the OpTextureQuery* instruction that was passed in.
     // Figure out the right return value and type, and return it.
-    Id createTextureQueryCall(Op, const TextureParameters&);
+    Id createTextureQueryCall(Op, const TextureParameters&, bool isUnsignedResult);
 
     Id createSamplePositionCall(Decoration precision, Id, Id);
 
diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
index 7c73d8d..f0f8b7a 100644
--- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
@@ -2317,7 +2317,7 @@
 
 // Module Version 10000
 // Generated by (magic number): 80001
-// Id's are bound by 552
+// Id's are bound by 550
 
                               Capability Shader
                               Capability Sampled1D
@@ -2326,7 +2326,7 @@
                               Capability ImageQuery
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 542 546
+                              EntryPoint Fragment 4  "main" 540 544
                               ExecutionMode 4 OriginUpperLeft
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
@@ -2346,111 +2346,111 @@
                               Name 52  "sizeQueryTemp"
                               Name 60  "sizeQueryTemp"
                               Name 63  "g_tTex1df4a"
-                              Name 70  "ElementsU"
-                              Name 74  "sizeQueryTemp"
-                              Name 83  "sizeQueryTemp"
-                              Name 86  "g_tTex1di4a"
-                              Name 93  "sizeQueryTemp"
-                              Name 102  "sizeQueryTemp"
-                              Name 105  "g_tTex1du4a"
-                              Name 112  "sizeQueryTemp"
-                              Name 121  "sizeQueryTemp"
-                              Name 124  "g_tTex2df4"
-                              Name 129  "HeightU"
-                              Name 132  "sizeQueryTemp"
-                              Name 141  "sizeQueryTemp"
-                              Name 144  "g_tTex2di4"
-                              Name 151  "sizeQueryTemp"
-                              Name 160  "sizeQueryTemp"
-                              Name 163  "g_tTex2du4"
-                              Name 170  "sizeQueryTemp"
-                              Name 181  "sizeQueryTemp"
-                              Name 184  "g_tTex2df4a"
-                              Name 195  "sizeQueryTemp"
-                              Name 206  "sizeQueryTemp"
-                              Name 209  "g_tTex2di4a"
-                              Name 218  "sizeQueryTemp"
-                              Name 229  "sizeQueryTemp"
-                              Name 232  "g_tTex2du4a"
-                              Name 241  "sizeQueryTemp"
-                              Name 252  "sizeQueryTemp"
-                              Name 255  "g_tTex3df4"
-                              Name 262  "DepthU"
-                              Name 265  "sizeQueryTemp"
-                              Name 276  "sizeQueryTemp"
-                              Name 279  "g_tTex3di4"
-                              Name 288  "sizeQueryTemp"
-                              Name 299  "sizeQueryTemp"
-                              Name 302  "g_tTex3du4"
-                              Name 311  "sizeQueryTemp"
-                              Name 322  "sizeQueryTemp"
-                              Name 325  "g_tTexcdf4"
-                              Name 332  "sizeQueryTemp"
-                              Name 341  "sizeQueryTemp"
-                              Name 344  "g_tTexcdi4"
-                              Name 351  "sizeQueryTemp"
-                              Name 360  "sizeQueryTemp"
-                              Name 363  "g_tTexcdu4"
-                              Name 370  "sizeQueryTemp"
-                              Name 379  "sizeQueryTemp"
-                              Name 382  "g_tTexcdf4a"
-                              Name 391  "sizeQueryTemp"
-                              Name 402  "sizeQueryTemp"
-                              Name 405  "g_tTexcdi4a"
-                              Name 414  "sizeQueryTemp"
-                              Name 425  "sizeQueryTemp"
-                              Name 428  "g_tTexcdu4a"
-                              Name 437  "sizeQueryTemp"
-                              Name 448  "sizeQueryTemp"
-                              Name 451  "g_tTex2dmsf4"
-                              Name 458  "NumberOfSamplesU"
-                              Name 461  "sizeQueryTemp"
-                              Name 464  "g_tTex2dmsi4"
-                              Name 473  "sizeQueryTemp"
-                              Name 476  "g_tTex2dmsu4"
-                              Name 485  "sizeQueryTemp"
-                              Name 488  "g_tTex2dmsf4a"
-                              Name 499  "sizeQueryTemp"
-                              Name 502  "g_tTex2dmsi4a"
-                              Name 513  "sizeQueryTemp"
-                              Name 516  "g_tTex2dmsu4a"
-                              Name 528  "psout"
-                              Name 539  "flattenTemp"
-                              Name 542  "Color"
-                              Name 546  "Depth"
-                              Name 551  "g_sSamp"
+                              Name 69  "ElementsU"
+                              Name 73  "sizeQueryTemp"
+                              Name 82  "sizeQueryTemp"
+                              Name 85  "g_tTex1di4a"
+                              Name 92  "sizeQueryTemp"
+                              Name 101  "sizeQueryTemp"
+                              Name 104  "g_tTex1du4a"
+                              Name 111  "sizeQueryTemp"
+                              Name 120  "sizeQueryTemp"
+                              Name 123  "g_tTex2df4"
+                              Name 128  "HeightU"
+                              Name 131  "sizeQueryTemp"
+                              Name 140  "sizeQueryTemp"
+                              Name 143  "g_tTex2di4"
+                              Name 150  "sizeQueryTemp"
+                              Name 159  "sizeQueryTemp"
+                              Name 162  "g_tTex2du4"
+                              Name 169  "sizeQueryTemp"
+                              Name 180  "sizeQueryTemp"
+                              Name 183  "g_tTex2df4a"
+                              Name 193  "sizeQueryTemp"
+                              Name 204  "sizeQueryTemp"
+                              Name 207  "g_tTex2di4a"
+                              Name 216  "sizeQueryTemp"
+                              Name 227  "sizeQueryTemp"
+                              Name 230  "g_tTex2du4a"
+                              Name 239  "sizeQueryTemp"
+                              Name 250  "sizeQueryTemp"
+                              Name 253  "g_tTex3df4"
+                              Name 260  "DepthU"
+                              Name 263  "sizeQueryTemp"
+                              Name 274  "sizeQueryTemp"
+                              Name 277  "g_tTex3di4"
+                              Name 286  "sizeQueryTemp"
+                              Name 297  "sizeQueryTemp"
+                              Name 300  "g_tTex3du4"
+                              Name 309  "sizeQueryTemp"
+                              Name 320  "sizeQueryTemp"
+                              Name 323  "g_tTexcdf4"
+                              Name 330  "sizeQueryTemp"
+                              Name 339  "sizeQueryTemp"
+                              Name 342  "g_tTexcdi4"
+                              Name 349  "sizeQueryTemp"
+                              Name 358  "sizeQueryTemp"
+                              Name 361  "g_tTexcdu4"
+                              Name 368  "sizeQueryTemp"
+                              Name 377  "sizeQueryTemp"
+                              Name 380  "g_tTexcdf4a"
+                              Name 389  "sizeQueryTemp"
+                              Name 400  "sizeQueryTemp"
+                              Name 403  "g_tTexcdi4a"
+                              Name 412  "sizeQueryTemp"
+                              Name 423  "sizeQueryTemp"
+                              Name 426  "g_tTexcdu4a"
+                              Name 435  "sizeQueryTemp"
+                              Name 446  "sizeQueryTemp"
+                              Name 449  "g_tTex2dmsf4"
+                              Name 456  "NumberOfSamplesU"
+                              Name 459  "sizeQueryTemp"
+                              Name 462  "g_tTex2dmsi4"
+                              Name 471  "sizeQueryTemp"
+                              Name 474  "g_tTex2dmsu4"
+                              Name 483  "sizeQueryTemp"
+                              Name 486  "g_tTex2dmsf4a"
+                              Name 497  "sizeQueryTemp"
+                              Name 500  "g_tTex2dmsi4a"
+                              Name 511  "sizeQueryTemp"
+                              Name 514  "g_tTex2dmsu4a"
+                              Name 526  "psout"
+                              Name 537  "flattenTemp"
+                              Name 540  "Color"
+                              Name 544  "Depth"
+                              Name 549  "g_sSamp"
                               Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 17(g_tTex1df4) Binding 0
                               Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 48(g_tTex1du4) DescriptorSet 0
                               Decorate 63(g_tTex1df4a) DescriptorSet 0
-                              Decorate 86(g_tTex1di4a) DescriptorSet 0
-                              Decorate 105(g_tTex1du4a) DescriptorSet 0
-                              Decorate 124(g_tTex2df4) DescriptorSet 0
-                              Decorate 144(g_tTex2di4) DescriptorSet 0
-                              Decorate 163(g_tTex2du4) DescriptorSet 0
-                              Decorate 184(g_tTex2df4a) DescriptorSet 0
-                              Decorate 209(g_tTex2di4a) DescriptorSet 0
-                              Decorate 232(g_tTex2du4a) DescriptorSet 0
-                              Decorate 255(g_tTex3df4) DescriptorSet 0
-                              Decorate 279(g_tTex3di4) DescriptorSet 0
-                              Decorate 302(g_tTex3du4) DescriptorSet 0
-                              Decorate 325(g_tTexcdf4) DescriptorSet 0
-                              Decorate 344(g_tTexcdi4) DescriptorSet 0
-                              Decorate 363(g_tTexcdu4) DescriptorSet 0
-                              Decorate 382(g_tTexcdf4a) DescriptorSet 0
-                              Decorate 405(g_tTexcdi4a) DescriptorSet 0
-                              Decorate 428(g_tTexcdu4a) DescriptorSet 0
-                              Decorate 451(g_tTex2dmsf4) DescriptorSet 0
-                              Decorate 464(g_tTex2dmsi4) DescriptorSet 0
-                              Decorate 476(g_tTex2dmsu4) DescriptorSet 0
-                              Decorate 488(g_tTex2dmsf4a) DescriptorSet 0
-                              Decorate 502(g_tTex2dmsi4a) DescriptorSet 0
-                              Decorate 516(g_tTex2dmsu4a) DescriptorSet 0
-                              Decorate 542(Color) Location 0
-                              Decorate 546(Depth) BuiltIn FragDepth
-                              Decorate 551(g_sSamp) DescriptorSet 0
-                              Decorate 551(g_sSamp) Binding 0
+                              Decorate 85(g_tTex1di4a) DescriptorSet 0
+                              Decorate 104(g_tTex1du4a) DescriptorSet 0
+                              Decorate 123(g_tTex2df4) DescriptorSet 0
+                              Decorate 143(g_tTex2di4) DescriptorSet 0
+                              Decorate 162(g_tTex2du4) DescriptorSet 0
+                              Decorate 183(g_tTex2df4a) DescriptorSet 0
+                              Decorate 207(g_tTex2di4a) DescriptorSet 0
+                              Decorate 230(g_tTex2du4a) DescriptorSet 0
+                              Decorate 253(g_tTex3df4) DescriptorSet 0
+                              Decorate 277(g_tTex3di4) DescriptorSet 0
+                              Decorate 300(g_tTex3du4) DescriptorSet 0
+                              Decorate 323(g_tTexcdf4) DescriptorSet 0
+                              Decorate 342(g_tTexcdi4) DescriptorSet 0
+                              Decorate 361(g_tTexcdu4) DescriptorSet 0
+                              Decorate 380(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 403(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 426(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 449(g_tTex2dmsf4) DescriptorSet 0
+                              Decorate 462(g_tTex2dmsi4) DescriptorSet 0
+                              Decorate 474(g_tTex2dmsu4) DescriptorSet 0
+                              Decorate 486(g_tTex2dmsf4a) DescriptorSet 0
+                              Decorate 500(g_tTex2dmsi4a) DescriptorSet 0
+                              Decorate 514(g_tTex2dmsu4a) DescriptorSet 0
+                              Decorate 540(Color) Location 0
+                              Decorate 544(Depth) BuiltIn FragDepth
+                              Decorate 549(g_sSamp) DescriptorSet 0
+                              Decorate 549(g_sSamp) Binding 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -2476,106 +2476,104 @@
               61:             TypeImage 6(float) 1D array sampled format:Unknown
               62:             TypePointer UniformConstant 61
  63(g_tTex1df4a):     62(ptr) Variable UniformConstant
-              65:             TypeVector 19(int) 2
-              67:     12(int) Constant 0
-              71:     12(int) Constant 1
-              84:             TypeImage 19(int) 1D array sampled format:Unknown
-              85:             TypePointer UniformConstant 84
- 86(g_tTex1di4a):     85(ptr) Variable UniformConstant
-             103:             TypeImage 12(int) 1D array sampled format:Unknown
-             104:             TypePointer UniformConstant 103
-105(g_tTex1du4a):    104(ptr) Variable UniformConstant
-             122:             TypeImage 6(float) 2D sampled format:Unknown
-             123:             TypePointer UniformConstant 122
- 124(g_tTex2df4):    123(ptr) Variable UniformConstant
-             142:             TypeImage 19(int) 2D sampled format:Unknown
-             143:             TypePointer UniformConstant 142
- 144(g_tTex2di4):    143(ptr) Variable UniformConstant
-             161:             TypeImage 12(int) 2D sampled format:Unknown
-             162:             TypePointer UniformConstant 161
- 163(g_tTex2du4):    162(ptr) Variable UniformConstant
-             179:             TypeVector 12(int) 3
-             180:             TypePointer Function 179(ivec3)
-             182:             TypeImage 6(float) 2D array sampled format:Unknown
-             183:             TypePointer UniformConstant 182
-184(g_tTex2df4a):    183(ptr) Variable UniformConstant
-             186:             TypeVector 19(int) 3
-             192:     12(int) Constant 2
-             207:             TypeImage 19(int) 2D array sampled format:Unknown
-             208:             TypePointer UniformConstant 207
-209(g_tTex2di4a):    208(ptr) Variable UniformConstant
-             230:             TypeImage 12(int) 2D array sampled format:Unknown
-             231:             TypePointer UniformConstant 230
-232(g_tTex2du4a):    231(ptr) Variable UniformConstant
-             253:             TypeImage 6(float) 3D sampled format:Unknown
-             254:             TypePointer UniformConstant 253
- 255(g_tTex3df4):    254(ptr) Variable UniformConstant
-             277:             TypeImage 19(int) 3D sampled format:Unknown
-             278:             TypePointer UniformConstant 277
- 279(g_tTex3di4):    278(ptr) Variable UniformConstant
-             300:             TypeImage 12(int) 3D sampled format:Unknown
-             301:             TypePointer UniformConstant 300
- 302(g_tTex3du4):    301(ptr) Variable UniformConstant
-             323:             TypeImage 6(float) Cube sampled format:Unknown
-             324:             TypePointer UniformConstant 323
- 325(g_tTexcdf4):    324(ptr) Variable UniformConstant
-             342:             TypeImage 19(int) Cube sampled format:Unknown
-             343:             TypePointer UniformConstant 342
- 344(g_tTexcdi4):    343(ptr) Variable UniformConstant
-             361:             TypeImage 12(int) Cube sampled format:Unknown
-             362:             TypePointer UniformConstant 361
- 363(g_tTexcdu4):    362(ptr) Variable UniformConstant
-             380:             TypeImage 6(float) Cube array sampled format:Unknown
-             381:             TypePointer UniformConstant 380
-382(g_tTexcdf4a):    381(ptr) Variable UniformConstant
-             403:             TypeImage 19(int) Cube array sampled format:Unknown
-             404:             TypePointer UniformConstant 403
-405(g_tTexcdi4a):    404(ptr) Variable UniformConstant
-             426:             TypeImage 12(int) Cube array sampled format:Unknown
-             427:             TypePointer UniformConstant 426
-428(g_tTexcdu4a):    427(ptr) Variable UniformConstant
-             449:             TypeImage 6(float) 2D multi-sampled sampled format:Unknown
-             450:             TypePointer UniformConstant 449
-451(g_tTex2dmsf4):    450(ptr) Variable UniformConstant
-             462:             TypeImage 19(int) 2D multi-sampled sampled format:Unknown
-             463:             TypePointer UniformConstant 462
-464(g_tTex2dmsi4):    463(ptr) Variable UniformConstant
-             474:             TypeImage 12(int) 2D multi-sampled sampled format:Unknown
-             475:             TypePointer UniformConstant 474
-476(g_tTex2dmsu4):    475(ptr) Variable UniformConstant
-             486:             TypeImage 6(float) 2D array multi-sampled sampled format:Unknown
-             487:             TypePointer UniformConstant 486
-488(g_tTex2dmsf4a):    487(ptr) Variable UniformConstant
-             500:             TypeImage 19(int) 2D array multi-sampled sampled format:Unknown
-             501:             TypePointer UniformConstant 500
-502(g_tTex2dmsi4a):    501(ptr) Variable UniformConstant
-             514:             TypeImage 12(int) 2D array multi-sampled sampled format:Unknown
-             515:             TypePointer UniformConstant 514
-516(g_tTex2dmsu4a):    515(ptr) Variable UniformConstant
-             527:             TypePointer Function 8(PS_OUTPUT)
-             529:    6(float) Constant 1065353216
-             530:    7(fvec4) ConstantComposite 529 529 529 529
-             531:             TypePointer Function 7(fvec4)
-             533:     19(int) Constant 1
-             534:             TypePointer Function 6(float)
-             541:             TypePointer Output 7(fvec4)
-      542(Color):    541(ptr) Variable Output
-             545:             TypePointer Output 6(float)
-      546(Depth):    545(ptr) Variable Output
-             549:             TypeSampler
-             550:             TypePointer UniformConstant 549
-    551(g_sSamp):    550(ptr) Variable UniformConstant
+              66:     12(int) Constant 0
+              70:     12(int) Constant 1
+              83:             TypeImage 19(int) 1D array sampled format:Unknown
+              84:             TypePointer UniformConstant 83
+ 85(g_tTex1di4a):     84(ptr) Variable UniformConstant
+             102:             TypeImage 12(int) 1D array sampled format:Unknown
+             103:             TypePointer UniformConstant 102
+104(g_tTex1du4a):    103(ptr) Variable UniformConstant
+             121:             TypeImage 6(float) 2D sampled format:Unknown
+             122:             TypePointer UniformConstant 121
+ 123(g_tTex2df4):    122(ptr) Variable UniformConstant
+             141:             TypeImage 19(int) 2D sampled format:Unknown
+             142:             TypePointer UniformConstant 141
+ 143(g_tTex2di4):    142(ptr) Variable UniformConstant
+             160:             TypeImage 12(int) 2D sampled format:Unknown
+             161:             TypePointer UniformConstant 160
+ 162(g_tTex2du4):    161(ptr) Variable UniformConstant
+             178:             TypeVector 12(int) 3
+             179:             TypePointer Function 178(ivec3)
+             181:             TypeImage 6(float) 2D array sampled format:Unknown
+             182:             TypePointer UniformConstant 181
+183(g_tTex2df4a):    182(ptr) Variable UniformConstant
+             190:     12(int) Constant 2
+             205:             TypeImage 19(int) 2D array sampled format:Unknown
+             206:             TypePointer UniformConstant 205
+207(g_tTex2di4a):    206(ptr) Variable UniformConstant
+             228:             TypeImage 12(int) 2D array sampled format:Unknown
+             229:             TypePointer UniformConstant 228
+230(g_tTex2du4a):    229(ptr) Variable UniformConstant
+             251:             TypeImage 6(float) 3D sampled format:Unknown
+             252:             TypePointer UniformConstant 251
+ 253(g_tTex3df4):    252(ptr) Variable UniformConstant
+             275:             TypeImage 19(int) 3D sampled format:Unknown
+             276:             TypePointer UniformConstant 275
+ 277(g_tTex3di4):    276(ptr) Variable UniformConstant
+             298:             TypeImage 12(int) 3D sampled format:Unknown
+             299:             TypePointer UniformConstant 298
+ 300(g_tTex3du4):    299(ptr) Variable UniformConstant
+             321:             TypeImage 6(float) Cube sampled format:Unknown
+             322:             TypePointer UniformConstant 321
+ 323(g_tTexcdf4):    322(ptr) Variable UniformConstant
+             340:             TypeImage 19(int) Cube sampled format:Unknown
+             341:             TypePointer UniformConstant 340
+ 342(g_tTexcdi4):    341(ptr) Variable UniformConstant
+             359:             TypeImage 12(int) Cube sampled format:Unknown
+             360:             TypePointer UniformConstant 359
+ 361(g_tTexcdu4):    360(ptr) Variable UniformConstant
+             378:             TypeImage 6(float) Cube array sampled format:Unknown
+             379:             TypePointer UniformConstant 378
+380(g_tTexcdf4a):    379(ptr) Variable UniformConstant
+             401:             TypeImage 19(int) Cube array sampled format:Unknown
+             402:             TypePointer UniformConstant 401
+403(g_tTexcdi4a):    402(ptr) Variable UniformConstant
+             424:             TypeImage 12(int) Cube array sampled format:Unknown
+             425:             TypePointer UniformConstant 424
+426(g_tTexcdu4a):    425(ptr) Variable UniformConstant
+             447:             TypeImage 6(float) 2D multi-sampled sampled format:Unknown
+             448:             TypePointer UniformConstant 447
+449(g_tTex2dmsf4):    448(ptr) Variable UniformConstant
+             460:             TypeImage 19(int) 2D multi-sampled sampled format:Unknown
+             461:             TypePointer UniformConstant 460
+462(g_tTex2dmsi4):    461(ptr) Variable UniformConstant
+             472:             TypeImage 12(int) 2D multi-sampled sampled format:Unknown
+             473:             TypePointer UniformConstant 472
+474(g_tTex2dmsu4):    473(ptr) Variable UniformConstant
+             484:             TypeImage 6(float) 2D array multi-sampled sampled format:Unknown
+             485:             TypePointer UniformConstant 484
+486(g_tTex2dmsf4a):    485(ptr) Variable UniformConstant
+             498:             TypeImage 19(int) 2D array multi-sampled sampled format:Unknown
+             499:             TypePointer UniformConstant 498
+500(g_tTex2dmsi4a):    499(ptr) Variable UniformConstant
+             512:             TypeImage 12(int) 2D array multi-sampled sampled format:Unknown
+             513:             TypePointer UniformConstant 512
+514(g_tTex2dmsu4a):    513(ptr) Variable UniformConstant
+             525:             TypePointer Function 8(PS_OUTPUT)
+             527:    6(float) Constant 1065353216
+             528:    7(fvec4) ConstantComposite 527 527 527 527
+             529:             TypePointer Function 7(fvec4)
+             531:     19(int) Constant 1
+             532:             TypePointer Function 6(float)
+             539:             TypePointer Output 7(fvec4)
+      540(Color):    539(ptr) Variable Output
+             543:             TypePointer Output 6(float)
+      544(Depth):    543(ptr) Variable Output
+             547:             TypeSampler
+             548:             TypePointer UniformConstant 547
+    549(g_sSamp):    548(ptr) Variable UniformConstant
          4(main):           2 Function None 3
                5:             Label
-539(flattenTemp):    527(ptr) Variable Function
-             540:8(PS_OUTPUT) FunctionCall 10(@main()
-                              Store 539(flattenTemp) 540
-             543:    531(ptr) AccessChain 539(flattenTemp) 20
-             544:    7(fvec4) Load 543
-                              Store 542(Color) 544
-             547:    534(ptr) AccessChain 539(flattenTemp) 533
-             548:    6(float) Load 547
-                              Store 546(Depth) 548
+537(flattenTemp):    525(ptr) Variable Function
+             538:8(PS_OUTPUT) FunctionCall 10(@main()
+                              Store 537(flattenTemp) 538
+             541:    529(ptr) AccessChain 537(flattenTemp) 20
+             542:    7(fvec4) Load 541
+                              Store 540(Color) 542
+             545:    532(ptr) AccessChain 537(flattenTemp) 531
+             546:    6(float) Load 545
+                              Store 544(Depth) 546
                               Return
                               FunctionEnd
       10(@main():8(PS_OUTPUT) Function None 9
@@ -2589,608 +2587,608 @@
 45(sizeQueryTemp):     13(ptr) Variable Function
 52(sizeQueryTemp):     13(ptr) Variable Function
 60(sizeQueryTemp):     59(ptr) Variable Function
-   70(ElementsU):     13(ptr) Variable Function
-74(sizeQueryTemp):     59(ptr) Variable Function
-83(sizeQueryTemp):     59(ptr) Variable Function
-93(sizeQueryTemp):     59(ptr) Variable Function
-102(sizeQueryTemp):     59(ptr) Variable Function
-112(sizeQueryTemp):     59(ptr) Variable Function
-121(sizeQueryTemp):     59(ptr) Variable Function
-    129(HeightU):     13(ptr) Variable Function
-132(sizeQueryTemp):     59(ptr) Variable Function
-141(sizeQueryTemp):     59(ptr) Variable Function
-151(sizeQueryTemp):     59(ptr) Variable Function
-160(sizeQueryTemp):     59(ptr) Variable Function
-170(sizeQueryTemp):     59(ptr) Variable Function
-181(sizeQueryTemp):    180(ptr) Variable Function
-195(sizeQueryTemp):    180(ptr) Variable Function
-206(sizeQueryTemp):    180(ptr) Variable Function
-218(sizeQueryTemp):    180(ptr) Variable Function
-229(sizeQueryTemp):    180(ptr) Variable Function
-241(sizeQueryTemp):    180(ptr) Variable Function
-252(sizeQueryTemp):    180(ptr) Variable Function
-     262(DepthU):     13(ptr) Variable Function
-265(sizeQueryTemp):    180(ptr) Variable Function
-276(sizeQueryTemp):    180(ptr) Variable Function
-288(sizeQueryTemp):    180(ptr) Variable Function
-299(sizeQueryTemp):    180(ptr) Variable Function
-311(sizeQueryTemp):    180(ptr) Variable Function
-322(sizeQueryTemp):     59(ptr) Variable Function
-332(sizeQueryTemp):     59(ptr) Variable Function
-341(sizeQueryTemp):     59(ptr) Variable Function
-351(sizeQueryTemp):     59(ptr) Variable Function
-360(sizeQueryTemp):     59(ptr) Variable Function
-370(sizeQueryTemp):     59(ptr) Variable Function
-379(sizeQueryTemp):    180(ptr) Variable Function
-391(sizeQueryTemp):    180(ptr) Variable Function
-402(sizeQueryTemp):    180(ptr) Variable Function
-414(sizeQueryTemp):    180(ptr) Variable Function
-425(sizeQueryTemp):    180(ptr) Variable Function
-437(sizeQueryTemp):    180(ptr) Variable Function
-448(sizeQueryTemp):     59(ptr) Variable Function
-458(NumberOfSamplesU):     13(ptr) Variable Function
-461(sizeQueryTemp):     59(ptr) Variable Function
-473(sizeQueryTemp):     59(ptr) Variable Function
-485(sizeQueryTemp):    180(ptr) Variable Function
-499(sizeQueryTemp):    180(ptr) Variable Function
-513(sizeQueryTemp):    180(ptr) Variable Function
-      528(psout):    527(ptr) Variable Function
+   69(ElementsU):     13(ptr) Variable Function
+73(sizeQueryTemp):     59(ptr) Variable Function
+82(sizeQueryTemp):     59(ptr) Variable Function
+92(sizeQueryTemp):     59(ptr) Variable Function
+101(sizeQueryTemp):     59(ptr) Variable Function
+111(sizeQueryTemp):     59(ptr) Variable Function
+120(sizeQueryTemp):     59(ptr) Variable Function
+    128(HeightU):     13(ptr) Variable Function
+131(sizeQueryTemp):     59(ptr) Variable Function
+140(sizeQueryTemp):     59(ptr) Variable Function
+150(sizeQueryTemp):     59(ptr) Variable Function
+159(sizeQueryTemp):     59(ptr) Variable Function
+169(sizeQueryTemp):     59(ptr) Variable Function
+180(sizeQueryTemp):    179(ptr) Variable Function
+193(sizeQueryTemp):    179(ptr) Variable Function
+204(sizeQueryTemp):    179(ptr) Variable Function
+216(sizeQueryTemp):    179(ptr) Variable Function
+227(sizeQueryTemp):    179(ptr) Variable Function
+239(sizeQueryTemp):    179(ptr) Variable Function
+250(sizeQueryTemp):    179(ptr) Variable Function
+     260(DepthU):     13(ptr) Variable Function
+263(sizeQueryTemp):    179(ptr) Variable Function
+274(sizeQueryTemp):    179(ptr) Variable Function
+286(sizeQueryTemp):    179(ptr) Variable Function
+297(sizeQueryTemp):    179(ptr) Variable Function
+309(sizeQueryTemp):    179(ptr) Variable Function
+320(sizeQueryTemp):     59(ptr) Variable Function
+330(sizeQueryTemp):     59(ptr) Variable Function
+339(sizeQueryTemp):     59(ptr) Variable Function
+349(sizeQueryTemp):     59(ptr) Variable Function
+358(sizeQueryTemp):     59(ptr) Variable Function
+368(sizeQueryTemp):     59(ptr) Variable Function
+377(sizeQueryTemp):    179(ptr) Variable Function
+389(sizeQueryTemp):    179(ptr) Variable Function
+400(sizeQueryTemp):    179(ptr) Variable Function
+412(sizeQueryTemp):    179(ptr) Variable Function
+423(sizeQueryTemp):    179(ptr) Variable Function
+435(sizeQueryTemp):    179(ptr) Variable Function
+446(sizeQueryTemp):     59(ptr) Variable Function
+456(NumberOfSamplesU):     13(ptr) Variable Function
+459(sizeQueryTemp):     59(ptr) Variable Function
+471(sizeQueryTemp):     59(ptr) Variable Function
+483(sizeQueryTemp):    179(ptr) Variable Function
+497(sizeQueryTemp):    179(ptr) Variable Function
+511(sizeQueryTemp):    179(ptr) Variable Function
+      526(psout):    525(ptr) Variable Function
               18:          15 Load 17(g_tTex1df4)
-              21:     19(int) ImageQuerySizeLod 18 20
+              21:     12(int) ImageQuerySizeLod 18 20
                               Store 14(sizeQueryTemp) 21
               23:     12(int) Load 14(sizeQueryTemp)
                               Store 22(WidthU) 23
               25:          15 Load 17(g_tTex1df4)
-              27:     19(int) ImageQuerySizeLod 25 26
+              27:     12(int) ImageQuerySizeLod 25 26
                               Store 24(sizeQueryTemp) 27
               28:     12(int) Load 24(sizeQueryTemp)
                               Store 22(WidthU) 28
               30:          15 Load 17(g_tTex1df4)
-              31:     19(int) ImageQueryLevels 30
+              31:     12(int) ImageQueryLevels 30
                               Store 29(NumberOfLevelsU) 31
               36:          33 Load 35(g_tTex1di4)
-              37:     19(int) ImageQuerySizeLod 36 20
+              37:     12(int) ImageQuerySizeLod 36 20
                               Store 32(sizeQueryTemp) 37
               38:     12(int) Load 32(sizeQueryTemp)
                               Store 22(WidthU) 38
               40:          33 Load 35(g_tTex1di4)
-              41:     19(int) ImageQuerySizeLod 40 26
+              41:     12(int) ImageQuerySizeLod 40 26
                               Store 39(sizeQueryTemp) 41
               42:     12(int) Load 39(sizeQueryTemp)
                               Store 22(WidthU) 42
               43:          33 Load 35(g_tTex1di4)
-              44:     19(int) ImageQueryLevels 43
+              44:     12(int) ImageQueryLevels 43
                               Store 29(NumberOfLevelsU) 44
               49:          46 Load 48(g_tTex1du4)
-              50:     19(int) ImageQuerySizeLod 49 20
+              50:     12(int) ImageQuerySizeLod 49 20
                               Store 45(sizeQueryTemp) 50
               51:     12(int) Load 45(sizeQueryTemp)
                               Store 22(WidthU) 51
               53:          46 Load 48(g_tTex1du4)
-              54:     19(int) ImageQuerySizeLod 53 26
+              54:     12(int) ImageQuerySizeLod 53 26
                               Store 52(sizeQueryTemp) 54
               55:     12(int) Load 52(sizeQueryTemp)
                               Store 22(WidthU) 55
               56:          46 Load 48(g_tTex1du4)
-              57:     19(int) ImageQueryLevels 56
+              57:     12(int) ImageQueryLevels 56
                               Store 29(NumberOfLevelsU) 57
               64:          61 Load 63(g_tTex1df4a)
-              66:   65(ivec2) ImageQuerySizeLod 64 20
-                              Store 60(sizeQueryTemp) 66
-              68:     13(ptr) AccessChain 60(sizeQueryTemp) 67
-              69:     12(int) Load 68
-                              Store 22(WidthU) 69
-              72:     13(ptr) AccessChain 60(sizeQueryTemp) 71
-              73:     12(int) Load 72
-                              Store 70(ElementsU) 73
-              75:          61 Load 63(g_tTex1df4a)
-              76:   65(ivec2) ImageQuerySizeLod 75 26
-                              Store 74(sizeQueryTemp) 76
-              77:     13(ptr) AccessChain 74(sizeQueryTemp) 67
-              78:     12(int) Load 77
-                              Store 22(WidthU) 78
-              79:     13(ptr) AccessChain 74(sizeQueryTemp) 71
-              80:     12(int) Load 79
-                              Store 70(ElementsU) 80
-              81:          61 Load 63(g_tTex1df4a)
-              82:     19(int) ImageQueryLevels 81
-                              Store 29(NumberOfLevelsU) 82
-              87:          84 Load 86(g_tTex1di4a)
-              88:   65(ivec2) ImageQuerySizeLod 87 20
-                              Store 83(sizeQueryTemp) 88
-              89:     13(ptr) AccessChain 83(sizeQueryTemp) 67
-              90:     12(int) Load 89
-                              Store 22(WidthU) 90
-              91:     13(ptr) AccessChain 83(sizeQueryTemp) 71
-              92:     12(int) Load 91
-                              Store 70(ElementsU) 92
-              94:          84 Load 86(g_tTex1di4a)
-              95:   65(ivec2) ImageQuerySizeLod 94 26
-                              Store 93(sizeQueryTemp) 95
-              96:     13(ptr) AccessChain 93(sizeQueryTemp) 67
-              97:     12(int) Load 96
-                              Store 22(WidthU) 97
-              98:     13(ptr) AccessChain 93(sizeQueryTemp) 71
-              99:     12(int) Load 98
-                              Store 70(ElementsU) 99
-             100:          84 Load 86(g_tTex1di4a)
-             101:     19(int) ImageQueryLevels 100
-                              Store 29(NumberOfLevelsU) 101
-             106:         103 Load 105(g_tTex1du4a)
-             107:   65(ivec2) ImageQuerySizeLod 106 20
-                              Store 102(sizeQueryTemp) 107
-             108:     13(ptr) AccessChain 102(sizeQueryTemp) 67
-             109:     12(int) Load 108
-                              Store 22(WidthU) 109
-             110:     13(ptr) AccessChain 102(sizeQueryTemp) 71
-             111:     12(int) Load 110
-                              Store 70(ElementsU) 111
-             113:         103 Load 105(g_tTex1du4a)
-             114:   65(ivec2) ImageQuerySizeLod 113 26
-                              Store 112(sizeQueryTemp) 114
-             115:     13(ptr) AccessChain 112(sizeQueryTemp) 67
-             116:     12(int) Load 115
-                              Store 22(WidthU) 116
-             117:     13(ptr) AccessChain 112(sizeQueryTemp) 71
-             118:     12(int) Load 117
-                              Store 70(ElementsU) 118
-             119:         103 Load 105(g_tTex1du4a)
-             120:     19(int) ImageQueryLevels 119
-                              Store 29(NumberOfLevelsU) 120
-             125:         122 Load 124(g_tTex2df4)
-             126:   65(ivec2) ImageQuerySizeLod 125 20
-                              Store 121(sizeQueryTemp) 126
-             127:     13(ptr) AccessChain 121(sizeQueryTemp) 67
-             128:     12(int) Load 127
-                              Store 22(WidthU) 128
-             130:     13(ptr) AccessChain 121(sizeQueryTemp) 71
-             131:     12(int) Load 130
-                              Store 129(HeightU) 131
-             133:         122 Load 124(g_tTex2df4)
-             134:   65(ivec2) ImageQuerySizeLod 133 26
-                              Store 132(sizeQueryTemp) 134
-             135:     13(ptr) AccessChain 132(sizeQueryTemp) 67
-             136:     12(int) Load 135
-                              Store 22(WidthU) 136
-             137:     13(ptr) AccessChain 132(sizeQueryTemp) 71
-             138:     12(int) Load 137
-                              Store 129(HeightU) 138
-             139:         122 Load 124(g_tTex2df4)
-             140:     19(int) ImageQueryLevels 139
-                              Store 29(NumberOfLevelsU) 140
-             145:         142 Load 144(g_tTex2di4)
-             146:   65(ivec2) ImageQuerySizeLod 145 20
-                              Store 141(sizeQueryTemp) 146
-             147:     13(ptr) AccessChain 141(sizeQueryTemp) 67
-             148:     12(int) Load 147
-                              Store 22(WidthU) 148
-             149:     13(ptr) AccessChain 141(sizeQueryTemp) 71
-             150:     12(int) Load 149
-                              Store 129(HeightU) 150
-             152:         142 Load 144(g_tTex2di4)
-             153:   65(ivec2) ImageQuerySizeLod 152 26
-                              Store 151(sizeQueryTemp) 153
-             154:     13(ptr) AccessChain 151(sizeQueryTemp) 67
-             155:     12(int) Load 154
-                              Store 22(WidthU) 155
-             156:     13(ptr) AccessChain 151(sizeQueryTemp) 71
-             157:     12(int) Load 156
-                              Store 129(HeightU) 157
-             158:         142 Load 144(g_tTex2di4)
-             159:     19(int) ImageQueryLevels 158
-                              Store 29(NumberOfLevelsU) 159
-             164:         161 Load 163(g_tTex2du4)
-             165:   65(ivec2) ImageQuerySizeLod 164 20
-                              Store 160(sizeQueryTemp) 165
-             166:     13(ptr) AccessChain 160(sizeQueryTemp) 67
-             167:     12(int) Load 166
-                              Store 22(WidthU) 167
-             168:     13(ptr) AccessChain 160(sizeQueryTemp) 71
-             169:     12(int) Load 168
-                              Store 129(HeightU) 169
-             171:         161 Load 163(g_tTex2du4)
-             172:   65(ivec2) ImageQuerySizeLod 171 26
-                              Store 170(sizeQueryTemp) 172
-             173:     13(ptr) AccessChain 170(sizeQueryTemp) 67
-             174:     12(int) Load 173
-                              Store 22(WidthU) 174
-             175:     13(ptr) AccessChain 170(sizeQueryTemp) 71
-             176:     12(int) Load 175
-                              Store 129(HeightU) 176
-             177:         161 Load 163(g_tTex2du4)
-             178:     19(int) ImageQueryLevels 177
-                              Store 29(NumberOfLevelsU) 178
-             185:         182 Load 184(g_tTex2df4a)
-             187:  186(ivec3) ImageQuerySizeLod 185 20
-                              Store 181(sizeQueryTemp) 187
-             188:     13(ptr) AccessChain 181(sizeQueryTemp) 67
+              65:   58(ivec2) ImageQuerySizeLod 64 20
+                              Store 60(sizeQueryTemp) 65
+              67:     13(ptr) AccessChain 60(sizeQueryTemp) 66
+              68:     12(int) Load 67
+                              Store 22(WidthU) 68
+              71:     13(ptr) AccessChain 60(sizeQueryTemp) 70
+              72:     12(int) Load 71
+                              Store 69(ElementsU) 72
+              74:          61 Load 63(g_tTex1df4a)
+              75:   58(ivec2) ImageQuerySizeLod 74 26
+                              Store 73(sizeQueryTemp) 75
+              76:     13(ptr) AccessChain 73(sizeQueryTemp) 66
+              77:     12(int) Load 76
+                              Store 22(WidthU) 77
+              78:     13(ptr) AccessChain 73(sizeQueryTemp) 70
+              79:     12(int) Load 78
+                              Store 69(ElementsU) 79
+              80:          61 Load 63(g_tTex1df4a)
+              81:     12(int) ImageQueryLevels 80
+                              Store 29(NumberOfLevelsU) 81
+              86:          83 Load 85(g_tTex1di4a)
+              87:   58(ivec2) ImageQuerySizeLod 86 20
+                              Store 82(sizeQueryTemp) 87
+              88:     13(ptr) AccessChain 82(sizeQueryTemp) 66
+              89:     12(int) Load 88
+                              Store 22(WidthU) 89
+              90:     13(ptr) AccessChain 82(sizeQueryTemp) 70
+              91:     12(int) Load 90
+                              Store 69(ElementsU) 91
+              93:          83 Load 85(g_tTex1di4a)
+              94:   58(ivec2) ImageQuerySizeLod 93 26
+                              Store 92(sizeQueryTemp) 94
+              95:     13(ptr) AccessChain 92(sizeQueryTemp) 66
+              96:     12(int) Load 95
+                              Store 22(WidthU) 96
+              97:     13(ptr) AccessChain 92(sizeQueryTemp) 70
+              98:     12(int) Load 97
+                              Store 69(ElementsU) 98
+              99:          83 Load 85(g_tTex1di4a)
+             100:     12(int) ImageQueryLevels 99
+                              Store 29(NumberOfLevelsU) 100
+             105:         102 Load 104(g_tTex1du4a)
+             106:   58(ivec2) ImageQuerySizeLod 105 20
+                              Store 101(sizeQueryTemp) 106
+             107:     13(ptr) AccessChain 101(sizeQueryTemp) 66
+             108:     12(int) Load 107
+                              Store 22(WidthU) 108
+             109:     13(ptr) AccessChain 101(sizeQueryTemp) 70
+             110:     12(int) Load 109
+                              Store 69(ElementsU) 110
+             112:         102 Load 104(g_tTex1du4a)
+             113:   58(ivec2) ImageQuerySizeLod 112 26
+                              Store 111(sizeQueryTemp) 113
+             114:     13(ptr) AccessChain 111(sizeQueryTemp) 66
+             115:     12(int) Load 114
+                              Store 22(WidthU) 115
+             116:     13(ptr) AccessChain 111(sizeQueryTemp) 70
+             117:     12(int) Load 116
+                              Store 69(ElementsU) 117
+             118:         102 Load 104(g_tTex1du4a)
+             119:     12(int) ImageQueryLevels 118
+                              Store 29(NumberOfLevelsU) 119
+             124:         121 Load 123(g_tTex2df4)
+             125:   58(ivec2) ImageQuerySizeLod 124 20
+                              Store 120(sizeQueryTemp) 125
+             126:     13(ptr) AccessChain 120(sizeQueryTemp) 66
+             127:     12(int) Load 126
+                              Store 22(WidthU) 127
+             129:     13(ptr) AccessChain 120(sizeQueryTemp) 70
+             130:     12(int) Load 129
+                              Store 128(HeightU) 130
+             132:         121 Load 123(g_tTex2df4)
+             133:   58(ivec2) ImageQuerySizeLod 132 26
+                              Store 131(sizeQueryTemp) 133
+             134:     13(ptr) AccessChain 131(sizeQueryTemp) 66
+             135:     12(int) Load 134
+                              Store 22(WidthU) 135
+             136:     13(ptr) AccessChain 131(sizeQueryTemp) 70
+             137:     12(int) Load 136
+                              Store 128(HeightU) 137
+             138:         121 Load 123(g_tTex2df4)
+             139:     12(int) ImageQueryLevels 138
+                              Store 29(NumberOfLevelsU) 139
+             144:         141 Load 143(g_tTex2di4)
+             145:   58(ivec2) ImageQuerySizeLod 144 20
+                              Store 140(sizeQueryTemp) 145
+             146:     13(ptr) AccessChain 140(sizeQueryTemp) 66
+             147:     12(int) Load 146
+                              Store 22(WidthU) 147
+             148:     13(ptr) AccessChain 140(sizeQueryTemp) 70
+             149:     12(int) Load 148
+                              Store 128(HeightU) 149
+             151:         141 Load 143(g_tTex2di4)
+             152:   58(ivec2) ImageQuerySizeLod 151 26
+                              Store 150(sizeQueryTemp) 152
+             153:     13(ptr) AccessChain 150(sizeQueryTemp) 66
+             154:     12(int) Load 153
+                              Store 22(WidthU) 154
+             155:     13(ptr) AccessChain 150(sizeQueryTemp) 70
+             156:     12(int) Load 155
+                              Store 128(HeightU) 156
+             157:         141 Load 143(g_tTex2di4)
+             158:     12(int) ImageQueryLevels 157
+                              Store 29(NumberOfLevelsU) 158
+             163:         160 Load 162(g_tTex2du4)
+             164:   58(ivec2) ImageQuerySizeLod 163 20
+                              Store 159(sizeQueryTemp) 164
+             165:     13(ptr) AccessChain 159(sizeQueryTemp) 66
+             166:     12(int) Load 165
+                              Store 22(WidthU) 166
+             167:     13(ptr) AccessChain 159(sizeQueryTemp) 70
+             168:     12(int) Load 167
+                              Store 128(HeightU) 168
+             170:         160 Load 162(g_tTex2du4)
+             171:   58(ivec2) ImageQuerySizeLod 170 26
+                              Store 169(sizeQueryTemp) 171
+             172:     13(ptr) AccessChain 169(sizeQueryTemp) 66
+             173:     12(int) Load 172
+                              Store 22(WidthU) 173
+             174:     13(ptr) AccessChain 169(sizeQueryTemp) 70
+             175:     12(int) Load 174
+                              Store 128(HeightU) 175
+             176:         160 Load 162(g_tTex2du4)
+             177:     12(int) ImageQueryLevels 176
+                              Store 29(NumberOfLevelsU) 177
+             184:         181 Load 183(g_tTex2df4a)
+             185:  178(ivec3) ImageQuerySizeLod 184 20
+                              Store 180(sizeQueryTemp) 185
+             186:     13(ptr) AccessChain 180(sizeQueryTemp) 66
+             187:     12(int) Load 186
+                              Store 22(WidthU) 187
+             188:     13(ptr) AccessChain 180(sizeQueryTemp) 70
              189:     12(int) Load 188
-                              Store 22(WidthU) 189
-             190:     13(ptr) AccessChain 181(sizeQueryTemp) 71
-             191:     12(int) Load 190
-                              Store 129(HeightU) 191
-             193:     13(ptr) AccessChain 181(sizeQueryTemp) 192
-             194:     12(int) Load 193
-                              Store 70(ElementsU) 194
-             196:         182 Load 184(g_tTex2df4a)
-             197:  186(ivec3) ImageQuerySizeLod 196 26
-                              Store 195(sizeQueryTemp) 197
-             198:     13(ptr) AccessChain 195(sizeQueryTemp) 67
+                              Store 128(HeightU) 189
+             191:     13(ptr) AccessChain 180(sizeQueryTemp) 190
+             192:     12(int) Load 191
+                              Store 69(ElementsU) 192
+             194:         181 Load 183(g_tTex2df4a)
+             195:  178(ivec3) ImageQuerySizeLod 194 26
+                              Store 193(sizeQueryTemp) 195
+             196:     13(ptr) AccessChain 193(sizeQueryTemp) 66
+             197:     12(int) Load 196
+                              Store 22(WidthU) 197
+             198:     13(ptr) AccessChain 193(sizeQueryTemp) 70
              199:     12(int) Load 198
-                              Store 22(WidthU) 199
-             200:     13(ptr) AccessChain 195(sizeQueryTemp) 71
+                              Store 128(HeightU) 199
+             200:     13(ptr) AccessChain 193(sizeQueryTemp) 190
              201:     12(int) Load 200
-                              Store 129(HeightU) 201
-             202:     13(ptr) AccessChain 195(sizeQueryTemp) 192
-             203:     12(int) Load 202
-                              Store 70(ElementsU) 203
-             204:         182 Load 184(g_tTex2df4a)
-             205:     19(int) ImageQueryLevels 204
-                              Store 29(NumberOfLevelsU) 205
-             210:         207 Load 209(g_tTex2di4a)
-             211:  186(ivec3) ImageQuerySizeLod 210 20
-                              Store 206(sizeQueryTemp) 211
-             212:     13(ptr) AccessChain 206(sizeQueryTemp) 67
+                              Store 69(ElementsU) 201
+             202:         181 Load 183(g_tTex2df4a)
+             203:     12(int) ImageQueryLevels 202
+                              Store 29(NumberOfLevelsU) 203
+             208:         205 Load 207(g_tTex2di4a)
+             209:  178(ivec3) ImageQuerySizeLod 208 20
+                              Store 204(sizeQueryTemp) 209
+             210:     13(ptr) AccessChain 204(sizeQueryTemp) 66
+             211:     12(int) Load 210
+                              Store 22(WidthU) 211
+             212:     13(ptr) AccessChain 204(sizeQueryTemp) 70
              213:     12(int) Load 212
-                              Store 22(WidthU) 213
-             214:     13(ptr) AccessChain 206(sizeQueryTemp) 71
+                              Store 128(HeightU) 213
+             214:     13(ptr) AccessChain 204(sizeQueryTemp) 190
              215:     12(int) Load 214
-                              Store 129(HeightU) 215
-             216:     13(ptr) AccessChain 206(sizeQueryTemp) 192
-             217:     12(int) Load 216
-                              Store 70(ElementsU) 217
-             219:         207 Load 209(g_tTex2di4a)
-             220:  186(ivec3) ImageQuerySizeLod 219 26
-                              Store 218(sizeQueryTemp) 220
-             221:     13(ptr) AccessChain 218(sizeQueryTemp) 67
+                              Store 69(ElementsU) 215
+             217:         205 Load 207(g_tTex2di4a)
+             218:  178(ivec3) ImageQuerySizeLod 217 26
+                              Store 216(sizeQueryTemp) 218
+             219:     13(ptr) AccessChain 216(sizeQueryTemp) 66
+             220:     12(int) Load 219
+                              Store 22(WidthU) 220
+             221:     13(ptr) AccessChain 216(sizeQueryTemp) 70
              222:     12(int) Load 221
-                              Store 22(WidthU) 222
-             223:     13(ptr) AccessChain 218(sizeQueryTemp) 71
+                              Store 128(HeightU) 222
+             223:     13(ptr) AccessChain 216(sizeQueryTemp) 190
              224:     12(int) Load 223
-                              Store 129(HeightU) 224
-             225:     13(ptr) AccessChain 218(sizeQueryTemp) 192
-             226:     12(int) Load 225
-                              Store 70(ElementsU) 226
-             227:         207 Load 209(g_tTex2di4a)
-             228:     19(int) ImageQueryLevels 227
-                              Store 29(NumberOfLevelsU) 228
-             233:         230 Load 232(g_tTex2du4a)
-             234:  186(ivec3) ImageQuerySizeLod 233 20
-                              Store 229(sizeQueryTemp) 234
-             235:     13(ptr) AccessChain 229(sizeQueryTemp) 67
+                              Store 69(ElementsU) 224
+             225:         205 Load 207(g_tTex2di4a)
+             226:     12(int) ImageQueryLevels 225
+                              Store 29(NumberOfLevelsU) 226
+             231:         228 Load 230(g_tTex2du4a)
+             232:  178(ivec3) ImageQuerySizeLod 231 20
+                              Store 227(sizeQueryTemp) 232
+             233:     13(ptr) AccessChain 227(sizeQueryTemp) 66
+             234:     12(int) Load 233
+                              Store 22(WidthU) 234
+             235:     13(ptr) AccessChain 227(sizeQueryTemp) 70
              236:     12(int) Load 235
-                              Store 22(WidthU) 236
-             237:     13(ptr) AccessChain 229(sizeQueryTemp) 71
+                              Store 128(HeightU) 236
+             237:     13(ptr) AccessChain 227(sizeQueryTemp) 190
              238:     12(int) Load 237
-                              Store 129(HeightU) 238
-             239:     13(ptr) AccessChain 229(sizeQueryTemp) 192
-             240:     12(int) Load 239
-                              Store 70(ElementsU) 240
-             242:         230 Load 232(g_tTex2du4a)
-             243:  186(ivec3) ImageQuerySizeLod 242 26
-                              Store 241(sizeQueryTemp) 243
-             244:     13(ptr) AccessChain 241(sizeQueryTemp) 67
+                              Store 69(ElementsU) 238
+             240:         228 Load 230(g_tTex2du4a)
+             241:  178(ivec3) ImageQuerySizeLod 240 26
+                              Store 239(sizeQueryTemp) 241
+             242:     13(ptr) AccessChain 239(sizeQueryTemp) 66
+             243:     12(int) Load 242
+                              Store 22(WidthU) 243
+             244:     13(ptr) AccessChain 239(sizeQueryTemp) 70
              245:     12(int) Load 244
-                              Store 22(WidthU) 245
-             246:     13(ptr) AccessChain 241(sizeQueryTemp) 71
+                              Store 128(HeightU) 245
+             246:     13(ptr) AccessChain 239(sizeQueryTemp) 190
              247:     12(int) Load 246
-                              Store 129(HeightU) 247
-             248:     13(ptr) AccessChain 241(sizeQueryTemp) 192
-             249:     12(int) Load 248
-                              Store 70(ElementsU) 249
-             250:         230 Load 232(g_tTex2du4a)
-             251:     19(int) ImageQueryLevels 250
-                              Store 29(NumberOfLevelsU) 251
-             256:         253 Load 255(g_tTex3df4)
-             257:  186(ivec3) ImageQuerySizeLod 256 20
-                              Store 252(sizeQueryTemp) 257
-             258:     13(ptr) AccessChain 252(sizeQueryTemp) 67
+                              Store 69(ElementsU) 247
+             248:         228 Load 230(g_tTex2du4a)
+             249:     12(int) ImageQueryLevels 248
+                              Store 29(NumberOfLevelsU) 249
+             254:         251 Load 253(g_tTex3df4)
+             255:  178(ivec3) ImageQuerySizeLod 254 20
+                              Store 250(sizeQueryTemp) 255
+             256:     13(ptr) AccessChain 250(sizeQueryTemp) 66
+             257:     12(int) Load 256
+                              Store 22(WidthU) 257
+             258:     13(ptr) AccessChain 250(sizeQueryTemp) 70
              259:     12(int) Load 258
-                              Store 22(WidthU) 259
-             260:     13(ptr) AccessChain 252(sizeQueryTemp) 71
-             261:     12(int) Load 260
-                              Store 129(HeightU) 261
-             263:     13(ptr) AccessChain 252(sizeQueryTemp) 192
-             264:     12(int) Load 263
-                              Store 262(DepthU) 264
-             266:         253 Load 255(g_tTex3df4)
-             267:  186(ivec3) ImageQuerySizeLod 266 26
-                              Store 265(sizeQueryTemp) 267
-             268:     13(ptr) AccessChain 265(sizeQueryTemp) 67
+                              Store 128(HeightU) 259
+             261:     13(ptr) AccessChain 250(sizeQueryTemp) 190
+             262:     12(int) Load 261
+                              Store 260(DepthU) 262
+             264:         251 Load 253(g_tTex3df4)
+             265:  178(ivec3) ImageQuerySizeLod 264 26
+                              Store 263(sizeQueryTemp) 265
+             266:     13(ptr) AccessChain 263(sizeQueryTemp) 66
+             267:     12(int) Load 266
+                              Store 22(WidthU) 267
+             268:     13(ptr) AccessChain 263(sizeQueryTemp) 70
              269:     12(int) Load 268
-                              Store 22(WidthU) 269
-             270:     13(ptr) AccessChain 265(sizeQueryTemp) 71
+                              Store 128(HeightU) 269
+             270:     13(ptr) AccessChain 263(sizeQueryTemp) 190
              271:     12(int) Load 270
-                              Store 129(HeightU) 271
-             272:     13(ptr) AccessChain 265(sizeQueryTemp) 192
-             273:     12(int) Load 272
-                              Store 262(DepthU) 273
-             274:         253 Load 255(g_tTex3df4)
-             275:     19(int) ImageQueryLevels 274
-                              Store 29(NumberOfLevelsU) 275
-             280:         277 Load 279(g_tTex3di4)
-             281:  186(ivec3) ImageQuerySizeLod 280 20
-                              Store 276(sizeQueryTemp) 281
-             282:     13(ptr) AccessChain 276(sizeQueryTemp) 67
+                              Store 260(DepthU) 271
+             272:         251 Load 253(g_tTex3df4)
+             273:     12(int) ImageQueryLevels 272
+                              Store 29(NumberOfLevelsU) 273
+             278:         275 Load 277(g_tTex3di4)
+             279:  178(ivec3) ImageQuerySizeLod 278 20
+                              Store 274(sizeQueryTemp) 279
+             280:     13(ptr) AccessChain 274(sizeQueryTemp) 66
+             281:     12(int) Load 280
+                              Store 22(WidthU) 281
+             282:     13(ptr) AccessChain 274(sizeQueryTemp) 70
              283:     12(int) Load 282
-                              Store 22(WidthU) 283
-             284:     13(ptr) AccessChain 276(sizeQueryTemp) 71
+                              Store 128(HeightU) 283
+             284:     13(ptr) AccessChain 274(sizeQueryTemp) 190
              285:     12(int) Load 284
-                              Store 129(HeightU) 285
-             286:     13(ptr) AccessChain 276(sizeQueryTemp) 192
-             287:     12(int) Load 286
-                              Store 262(DepthU) 287
-             289:         277 Load 279(g_tTex3di4)
-             290:  186(ivec3) ImageQuerySizeLod 289 26
-                              Store 288(sizeQueryTemp) 290
-             291:     13(ptr) AccessChain 288(sizeQueryTemp) 67
+                              Store 260(DepthU) 285
+             287:         275 Load 277(g_tTex3di4)
+             288:  178(ivec3) ImageQuerySizeLod 287 26
+                              Store 286(sizeQueryTemp) 288
+             289:     13(ptr) AccessChain 286(sizeQueryTemp) 66
+             290:     12(int) Load 289
+                              Store 22(WidthU) 290
+             291:     13(ptr) AccessChain 286(sizeQueryTemp) 70
              292:     12(int) Load 291
-                              Store 22(WidthU) 292
-             293:     13(ptr) AccessChain 288(sizeQueryTemp) 71
+                              Store 128(HeightU) 292
+             293:     13(ptr) AccessChain 286(sizeQueryTemp) 190
              294:     12(int) Load 293
-                              Store 129(HeightU) 294
-             295:     13(ptr) AccessChain 288(sizeQueryTemp) 192
-             296:     12(int) Load 295
-                              Store 262(DepthU) 296
-             297:         277 Load 279(g_tTex3di4)
-             298:     19(int) ImageQueryLevels 297
-                              Store 29(NumberOfLevelsU) 298
-             303:         300 Load 302(g_tTex3du4)
-             304:  186(ivec3) ImageQuerySizeLod 303 20
-                              Store 299(sizeQueryTemp) 304
-             305:     13(ptr) AccessChain 299(sizeQueryTemp) 67
+                              Store 260(DepthU) 294
+             295:         275 Load 277(g_tTex3di4)
+             296:     12(int) ImageQueryLevels 295
+                              Store 29(NumberOfLevelsU) 296
+             301:         298 Load 300(g_tTex3du4)
+             302:  178(ivec3) ImageQuerySizeLod 301 20
+                              Store 297(sizeQueryTemp) 302
+             303:     13(ptr) AccessChain 297(sizeQueryTemp) 66
+             304:     12(int) Load 303
+                              Store 22(WidthU) 304
+             305:     13(ptr) AccessChain 297(sizeQueryTemp) 70
              306:     12(int) Load 305
-                              Store 22(WidthU) 306
-             307:     13(ptr) AccessChain 299(sizeQueryTemp) 71
+                              Store 128(HeightU) 306
+             307:     13(ptr) AccessChain 297(sizeQueryTemp) 190
              308:     12(int) Load 307
-                              Store 129(HeightU) 308
-             309:     13(ptr) AccessChain 299(sizeQueryTemp) 192
-             310:     12(int) Load 309
-                              Store 262(DepthU) 310
-             312:         300 Load 302(g_tTex3du4)
-             313:  186(ivec3) ImageQuerySizeLod 312 26
-                              Store 311(sizeQueryTemp) 313
-             314:     13(ptr) AccessChain 311(sizeQueryTemp) 67
+                              Store 260(DepthU) 308
+             310:         298 Load 300(g_tTex3du4)
+             311:  178(ivec3) ImageQuerySizeLod 310 26
+                              Store 309(sizeQueryTemp) 311
+             312:     13(ptr) AccessChain 309(sizeQueryTemp) 66
+             313:     12(int) Load 312
+                              Store 22(WidthU) 313
+             314:     13(ptr) AccessChain 309(sizeQueryTemp) 70
              315:     12(int) Load 314
-                              Store 22(WidthU) 315
-             316:     13(ptr) AccessChain 311(sizeQueryTemp) 71
+                              Store 128(HeightU) 315
+             316:     13(ptr) AccessChain 309(sizeQueryTemp) 190
              317:     12(int) Load 316
-                              Store 129(HeightU) 317
-             318:     13(ptr) AccessChain 311(sizeQueryTemp) 192
-             319:     12(int) Load 318
-                              Store 262(DepthU) 319
-             320:         300 Load 302(g_tTex3du4)
-             321:     19(int) ImageQueryLevels 320
-                              Store 29(NumberOfLevelsU) 321
-             326:         323 Load 325(g_tTexcdf4)
-             327:   65(ivec2) ImageQuerySizeLod 326 20
-                              Store 322(sizeQueryTemp) 327
-             328:     13(ptr) AccessChain 322(sizeQueryTemp) 67
+                              Store 260(DepthU) 317
+             318:         298 Load 300(g_tTex3du4)
+             319:     12(int) ImageQueryLevels 318
+                              Store 29(NumberOfLevelsU) 319
+             324:         321 Load 323(g_tTexcdf4)
+             325:   58(ivec2) ImageQuerySizeLod 324 20
+                              Store 320(sizeQueryTemp) 325
+             326:     13(ptr) AccessChain 320(sizeQueryTemp) 66
+             327:     12(int) Load 326
+                              Store 22(WidthU) 327
+             328:     13(ptr) AccessChain 320(sizeQueryTemp) 70
              329:     12(int) Load 328
-                              Store 22(WidthU) 329
-             330:     13(ptr) AccessChain 322(sizeQueryTemp) 71
-             331:     12(int) Load 330
-                              Store 129(HeightU) 331
-             333:         323 Load 325(g_tTexcdf4)
-             334:   65(ivec2) ImageQuerySizeLod 333 26
-                              Store 332(sizeQueryTemp) 334
-             335:     13(ptr) AccessChain 332(sizeQueryTemp) 67
+                              Store 128(HeightU) 329
+             331:         321 Load 323(g_tTexcdf4)
+             332:   58(ivec2) ImageQuerySizeLod 331 26
+                              Store 330(sizeQueryTemp) 332
+             333:     13(ptr) AccessChain 330(sizeQueryTemp) 66
+             334:     12(int) Load 333
+                              Store 22(WidthU) 334
+             335:     13(ptr) AccessChain 330(sizeQueryTemp) 70
              336:     12(int) Load 335
-                              Store 22(WidthU) 336
-             337:     13(ptr) AccessChain 332(sizeQueryTemp) 71
-             338:     12(int) Load 337
-                              Store 129(HeightU) 338
-             339:         323 Load 325(g_tTexcdf4)
-             340:     19(int) ImageQueryLevels 339
-                              Store 29(NumberOfLevelsU) 340
-             345:         342 Load 344(g_tTexcdi4)
-             346:   65(ivec2) ImageQuerySizeLod 345 20
-                              Store 341(sizeQueryTemp) 346
-             347:     13(ptr) AccessChain 341(sizeQueryTemp) 67
+                              Store 128(HeightU) 336
+             337:         321 Load 323(g_tTexcdf4)
+             338:     12(int) ImageQueryLevels 337
+                              Store 29(NumberOfLevelsU) 338
+             343:         340 Load 342(g_tTexcdi4)
+             344:   58(ivec2) ImageQuerySizeLod 343 20
+                              Store 339(sizeQueryTemp) 344
+             345:     13(ptr) AccessChain 339(sizeQueryTemp) 66
+             346:     12(int) Load 345
+                              Store 22(WidthU) 346
+             347:     13(ptr) AccessChain 339(sizeQueryTemp) 70
              348:     12(int) Load 347
-                              Store 22(WidthU) 348
-             349:     13(ptr) AccessChain 341(sizeQueryTemp) 71
-             350:     12(int) Load 349
-                              Store 129(HeightU) 350
-             352:         342 Load 344(g_tTexcdi4)
-             353:   65(ivec2) ImageQuerySizeLod 352 26
-                              Store 351(sizeQueryTemp) 353
-             354:     13(ptr) AccessChain 351(sizeQueryTemp) 67
+                              Store 128(HeightU) 348
+             350:         340 Load 342(g_tTexcdi4)
+             351:   58(ivec2) ImageQuerySizeLod 350 26
+                              Store 349(sizeQueryTemp) 351
+             352:     13(ptr) AccessChain 349(sizeQueryTemp) 66
+             353:     12(int) Load 352
+                              Store 22(WidthU) 353
+             354:     13(ptr) AccessChain 349(sizeQueryTemp) 70
              355:     12(int) Load 354
-                              Store 22(WidthU) 355
-             356:     13(ptr) AccessChain 351(sizeQueryTemp) 71
-             357:     12(int) Load 356
-                              Store 129(HeightU) 357
-             358:         342 Load 344(g_tTexcdi4)
-             359:     19(int) ImageQueryLevels 358
-                              Store 29(NumberOfLevelsU) 359
-             364:         361 Load 363(g_tTexcdu4)
-             365:   65(ivec2) ImageQuerySizeLod 364 20
-                              Store 360(sizeQueryTemp) 365
-             366:     13(ptr) AccessChain 360(sizeQueryTemp) 67
+                              Store 128(HeightU) 355
+             356:         340 Load 342(g_tTexcdi4)
+             357:     12(int) ImageQueryLevels 356
+                              Store 29(NumberOfLevelsU) 357
+             362:         359 Load 361(g_tTexcdu4)
+             363:   58(ivec2) ImageQuerySizeLod 362 20
+                              Store 358(sizeQueryTemp) 363
+             364:     13(ptr) AccessChain 358(sizeQueryTemp) 66
+             365:     12(int) Load 364
+                              Store 22(WidthU) 365
+             366:     13(ptr) AccessChain 358(sizeQueryTemp) 70
              367:     12(int) Load 366
-                              Store 22(WidthU) 367
-             368:     13(ptr) AccessChain 360(sizeQueryTemp) 71
-             369:     12(int) Load 368
-                              Store 129(HeightU) 369
-             371:         361 Load 363(g_tTexcdu4)
-             372:   65(ivec2) ImageQuerySizeLod 371 26
-                              Store 370(sizeQueryTemp) 372
-             373:     13(ptr) AccessChain 370(sizeQueryTemp) 67
+                              Store 128(HeightU) 367
+             369:         359 Load 361(g_tTexcdu4)
+             370:   58(ivec2) ImageQuerySizeLod 369 26
+                              Store 368(sizeQueryTemp) 370
+             371:     13(ptr) AccessChain 368(sizeQueryTemp) 66
+             372:     12(int) Load 371
+                              Store 22(WidthU) 372
+             373:     13(ptr) AccessChain 368(sizeQueryTemp) 70
              374:     12(int) Load 373
-                              Store 22(WidthU) 374
-             375:     13(ptr) AccessChain 370(sizeQueryTemp) 71
-             376:     12(int) Load 375
-                              Store 129(HeightU) 376
-             377:         361 Load 363(g_tTexcdu4)
-             378:     19(int) ImageQueryLevels 377
-                              Store 29(NumberOfLevelsU) 378
-             383:         380 Load 382(g_tTexcdf4a)
-             384:  186(ivec3) ImageQuerySizeLod 383 20
-                              Store 379(sizeQueryTemp) 384
-             385:     13(ptr) AccessChain 379(sizeQueryTemp) 67
+                              Store 128(HeightU) 374
+             375:         359 Load 361(g_tTexcdu4)
+             376:     12(int) ImageQueryLevels 375
+                              Store 29(NumberOfLevelsU) 376
+             381:         378 Load 380(g_tTexcdf4a)
+             382:  178(ivec3) ImageQuerySizeLod 381 20
+                              Store 377(sizeQueryTemp) 382
+             383:     13(ptr) AccessChain 377(sizeQueryTemp) 66
+             384:     12(int) Load 383
+                              Store 22(WidthU) 384
+             385:     13(ptr) AccessChain 377(sizeQueryTemp) 70
              386:     12(int) Load 385
-                              Store 22(WidthU) 386
-             387:     13(ptr) AccessChain 379(sizeQueryTemp) 71
+                              Store 128(HeightU) 386
+             387:     13(ptr) AccessChain 377(sizeQueryTemp) 190
              388:     12(int) Load 387
-                              Store 129(HeightU) 388
-             389:     13(ptr) AccessChain 379(sizeQueryTemp) 192
-             390:     12(int) Load 389
-                              Store 70(ElementsU) 390
-             392:         380 Load 382(g_tTexcdf4a)
-             393:  186(ivec3) ImageQuerySizeLod 392 26
-                              Store 391(sizeQueryTemp) 393
-             394:     13(ptr) AccessChain 391(sizeQueryTemp) 67
+                              Store 69(ElementsU) 388
+             390:         378 Load 380(g_tTexcdf4a)
+             391:  178(ivec3) ImageQuerySizeLod 390 26
+                              Store 389(sizeQueryTemp) 391
+             392:     13(ptr) AccessChain 389(sizeQueryTemp) 66
+             393:     12(int) Load 392
+                              Store 22(WidthU) 393
+             394:     13(ptr) AccessChain 389(sizeQueryTemp) 70
              395:     12(int) Load 394
-                              Store 22(WidthU) 395
-             396:     13(ptr) AccessChain 391(sizeQueryTemp) 71
+                              Store 128(HeightU) 395
+             396:     13(ptr) AccessChain 389(sizeQueryTemp) 190
              397:     12(int) Load 396
-                              Store 129(HeightU) 397
-             398:     13(ptr) AccessChain 391(sizeQueryTemp) 192
-             399:     12(int) Load 398
-                              Store 70(ElementsU) 399
-             400:         380 Load 382(g_tTexcdf4a)
-             401:     19(int) ImageQueryLevels 400
-                              Store 29(NumberOfLevelsU) 401
-             406:         403 Load 405(g_tTexcdi4a)
-             407:  186(ivec3) ImageQuerySizeLod 406 20
-                              Store 402(sizeQueryTemp) 407
-             408:     13(ptr) AccessChain 402(sizeQueryTemp) 67
+                              Store 69(ElementsU) 397
+             398:         378 Load 380(g_tTexcdf4a)
+             399:     12(int) ImageQueryLevels 398
+                              Store 29(NumberOfLevelsU) 399
+             404:         401 Load 403(g_tTexcdi4a)
+             405:  178(ivec3) ImageQuerySizeLod 404 20
+                              Store 400(sizeQueryTemp) 405
+             406:     13(ptr) AccessChain 400(sizeQueryTemp) 66
+             407:     12(int) Load 406
+                              Store 22(WidthU) 407
+             408:     13(ptr) AccessChain 400(sizeQueryTemp) 70
              409:     12(int) Load 408
-                              Store 22(WidthU) 409
-             410:     13(ptr) AccessChain 402(sizeQueryTemp) 71
+                              Store 128(HeightU) 409
+             410:     13(ptr) AccessChain 400(sizeQueryTemp) 190
              411:     12(int) Load 410
-                              Store 129(HeightU) 411
-             412:     13(ptr) AccessChain 402(sizeQueryTemp) 192
-             413:     12(int) Load 412
-                              Store 70(ElementsU) 413
-             415:         403 Load 405(g_tTexcdi4a)
-             416:  186(ivec3) ImageQuerySizeLod 415 26
-                              Store 414(sizeQueryTemp) 416
-             417:     13(ptr) AccessChain 414(sizeQueryTemp) 67
+                              Store 69(ElementsU) 411
+             413:         401 Load 403(g_tTexcdi4a)
+             414:  178(ivec3) ImageQuerySizeLod 413 26
+                              Store 412(sizeQueryTemp) 414
+             415:     13(ptr) AccessChain 412(sizeQueryTemp) 66
+             416:     12(int) Load 415
+                              Store 22(WidthU) 416
+             417:     13(ptr) AccessChain 412(sizeQueryTemp) 70
              418:     12(int) Load 417
-                              Store 22(WidthU) 418
-             419:     13(ptr) AccessChain 414(sizeQueryTemp) 71
+                              Store 128(HeightU) 418
+             419:     13(ptr) AccessChain 412(sizeQueryTemp) 190
              420:     12(int) Load 419
-                              Store 129(HeightU) 420
-             421:     13(ptr) AccessChain 414(sizeQueryTemp) 192
-             422:     12(int) Load 421
-                              Store 70(ElementsU) 422
-             423:         403 Load 405(g_tTexcdi4a)
-             424:     19(int) ImageQueryLevels 423
-                              Store 29(NumberOfLevelsU) 424
-             429:         426 Load 428(g_tTexcdu4a)
-             430:  186(ivec3) ImageQuerySizeLod 429 20
-                              Store 425(sizeQueryTemp) 430
-             431:     13(ptr) AccessChain 425(sizeQueryTemp) 67
+                              Store 69(ElementsU) 420
+             421:         401 Load 403(g_tTexcdi4a)
+             422:     12(int) ImageQueryLevels 421
+                              Store 29(NumberOfLevelsU) 422
+             427:         424 Load 426(g_tTexcdu4a)
+             428:  178(ivec3) ImageQuerySizeLod 427 20
+                              Store 423(sizeQueryTemp) 428
+             429:     13(ptr) AccessChain 423(sizeQueryTemp) 66
+             430:     12(int) Load 429
+                              Store 22(WidthU) 430
+             431:     13(ptr) AccessChain 423(sizeQueryTemp) 70
              432:     12(int) Load 431
-                              Store 22(WidthU) 432
-             433:     13(ptr) AccessChain 425(sizeQueryTemp) 71
+                              Store 128(HeightU) 432
+             433:     13(ptr) AccessChain 423(sizeQueryTemp) 190
              434:     12(int) Load 433
-                              Store 129(HeightU) 434
-             435:     13(ptr) AccessChain 425(sizeQueryTemp) 192
-             436:     12(int) Load 435
-                              Store 70(ElementsU) 436
-             438:         426 Load 428(g_tTexcdu4a)
-             439:  186(ivec3) ImageQuerySizeLod 438 26
-                              Store 437(sizeQueryTemp) 439
-             440:     13(ptr) AccessChain 437(sizeQueryTemp) 67
+                              Store 69(ElementsU) 434
+             436:         424 Load 426(g_tTexcdu4a)
+             437:  178(ivec3) ImageQuerySizeLod 436 26
+                              Store 435(sizeQueryTemp) 437
+             438:     13(ptr) AccessChain 435(sizeQueryTemp) 66
+             439:     12(int) Load 438
+                              Store 22(WidthU) 439
+             440:     13(ptr) AccessChain 435(sizeQueryTemp) 70
              441:     12(int) Load 440
-                              Store 22(WidthU) 441
-             442:     13(ptr) AccessChain 437(sizeQueryTemp) 71
+                              Store 128(HeightU) 441
+             442:     13(ptr) AccessChain 435(sizeQueryTemp) 190
              443:     12(int) Load 442
-                              Store 129(HeightU) 443
-             444:     13(ptr) AccessChain 437(sizeQueryTemp) 192
-             445:     12(int) Load 444
-                              Store 70(ElementsU) 445
-             446:         426 Load 428(g_tTexcdu4a)
-             447:     19(int) ImageQueryLevels 446
-                              Store 29(NumberOfLevelsU) 447
-             452:         449 Load 451(g_tTex2dmsf4)
-             453:   65(ivec2) ImageQuerySize 452
-                              Store 448(sizeQueryTemp) 453
-             454:     13(ptr) AccessChain 448(sizeQueryTemp) 67
+                              Store 69(ElementsU) 443
+             444:         424 Load 426(g_tTexcdu4a)
+             445:     12(int) ImageQueryLevels 444
+                              Store 29(NumberOfLevelsU) 445
+             450:         447 Load 449(g_tTex2dmsf4)
+             451:   58(ivec2) ImageQuerySize 450
+                              Store 446(sizeQueryTemp) 451
+             452:     13(ptr) AccessChain 446(sizeQueryTemp) 66
+             453:     12(int) Load 452
+                              Store 22(WidthU) 453
+             454:     13(ptr) AccessChain 446(sizeQueryTemp) 70
              455:     12(int) Load 454
-                              Store 22(WidthU) 455
-             456:     13(ptr) AccessChain 448(sizeQueryTemp) 71
-             457:     12(int) Load 456
-                              Store 129(HeightU) 457
-             459:         449 Load 451(g_tTex2dmsf4)
-             460:     19(int) ImageQuerySamples 459
-                              Store 458(NumberOfSamplesU) 460
-             465:         462 Load 464(g_tTex2dmsi4)
-             466:   65(ivec2) ImageQuerySize 465
-                              Store 461(sizeQueryTemp) 466
-             467:     13(ptr) AccessChain 461(sizeQueryTemp) 67
+                              Store 128(HeightU) 455
+             457:         447 Load 449(g_tTex2dmsf4)
+             458:     12(int) ImageQuerySamples 457
+                              Store 456(NumberOfSamplesU) 458
+             463:         460 Load 462(g_tTex2dmsi4)
+             464:   58(ivec2) ImageQuerySize 463
+                              Store 459(sizeQueryTemp) 464
+             465:     13(ptr) AccessChain 459(sizeQueryTemp) 66
+             466:     12(int) Load 465
+                              Store 22(WidthU) 466
+             467:     13(ptr) AccessChain 459(sizeQueryTemp) 70
              468:     12(int) Load 467
-                              Store 22(WidthU) 468
-             469:     13(ptr) AccessChain 461(sizeQueryTemp) 71
-             470:     12(int) Load 469
-                              Store 129(HeightU) 470
-             471:         462 Load 464(g_tTex2dmsi4)
-             472:     19(int) ImageQuerySamples 471
-                              Store 458(NumberOfSamplesU) 472
-             477:         474 Load 476(g_tTex2dmsu4)
-             478:   65(ivec2) ImageQuerySize 477
-                              Store 473(sizeQueryTemp) 478
-             479:     13(ptr) AccessChain 473(sizeQueryTemp) 67
+                              Store 128(HeightU) 468
+             469:         460 Load 462(g_tTex2dmsi4)
+             470:     12(int) ImageQuerySamples 469
+                              Store 456(NumberOfSamplesU) 470
+             475:         472 Load 474(g_tTex2dmsu4)
+             476:   58(ivec2) ImageQuerySize 475
+                              Store 471(sizeQueryTemp) 476
+             477:     13(ptr) AccessChain 471(sizeQueryTemp) 66
+             478:     12(int) Load 477
+                              Store 22(WidthU) 478
+             479:     13(ptr) AccessChain 471(sizeQueryTemp) 70
              480:     12(int) Load 479
-                              Store 22(WidthU) 480
-             481:     13(ptr) AccessChain 473(sizeQueryTemp) 71
-             482:     12(int) Load 481
-                              Store 129(HeightU) 482
-             483:         474 Load 476(g_tTex2dmsu4)
-             484:     19(int) ImageQuerySamples 483
-                              Store 458(NumberOfSamplesU) 484
-             489:         486 Load 488(g_tTex2dmsf4a)
-             490:  186(ivec3) ImageQuerySize 489
-                              Store 485(sizeQueryTemp) 490
-             491:     13(ptr) AccessChain 485(sizeQueryTemp) 67
+                              Store 128(HeightU) 480
+             481:         472 Load 474(g_tTex2dmsu4)
+             482:     12(int) ImageQuerySamples 481
+                              Store 456(NumberOfSamplesU) 482
+             487:         484 Load 486(g_tTex2dmsf4a)
+             488:  178(ivec3) ImageQuerySize 487
+                              Store 483(sizeQueryTemp) 488
+             489:     13(ptr) AccessChain 483(sizeQueryTemp) 66
+             490:     12(int) Load 489
+                              Store 22(WidthU) 490
+             491:     13(ptr) AccessChain 483(sizeQueryTemp) 70
              492:     12(int) Load 491
-                              Store 22(WidthU) 492
-             493:     13(ptr) AccessChain 485(sizeQueryTemp) 71
+                              Store 128(HeightU) 492
+             493:     13(ptr) AccessChain 483(sizeQueryTemp) 190
              494:     12(int) Load 493
-                              Store 129(HeightU) 494
-             495:     13(ptr) AccessChain 485(sizeQueryTemp) 192
-             496:     12(int) Load 495
-                              Store 70(ElementsU) 496
-             497:         486 Load 488(g_tTex2dmsf4a)
-             498:     19(int) ImageQuerySamples 497
-                              Store 458(NumberOfSamplesU) 498
-             503:         500 Load 502(g_tTex2dmsi4a)
-             504:  186(ivec3) ImageQuerySize 503
-                              Store 499(sizeQueryTemp) 504
-             505:     13(ptr) AccessChain 499(sizeQueryTemp) 67
+                              Store 69(ElementsU) 494
+             495:         484 Load 486(g_tTex2dmsf4a)
+             496:     12(int) ImageQuerySamples 495
+                              Store 456(NumberOfSamplesU) 496
+             501:         498 Load 500(g_tTex2dmsi4a)
+             502:  178(ivec3) ImageQuerySize 501
+                              Store 497(sizeQueryTemp) 502
+             503:     13(ptr) AccessChain 497(sizeQueryTemp) 66
+             504:     12(int) Load 503
+                              Store 22(WidthU) 504
+             505:     13(ptr) AccessChain 497(sizeQueryTemp) 70
              506:     12(int) Load 505
-                              Store 22(WidthU) 506
-             507:     13(ptr) AccessChain 499(sizeQueryTemp) 71
+                              Store 128(HeightU) 506
+             507:     13(ptr) AccessChain 497(sizeQueryTemp) 190
              508:     12(int) Load 507
-                              Store 129(HeightU) 508
-             509:     13(ptr) AccessChain 499(sizeQueryTemp) 192
-             510:     12(int) Load 509
-                              Store 70(ElementsU) 510
-             511:         500 Load 502(g_tTex2dmsi4a)
-             512:     19(int) ImageQuerySamples 511
-                              Store 458(NumberOfSamplesU) 512
-             517:         514 Load 516(g_tTex2dmsu4a)
-             518:  186(ivec3) ImageQuerySize 517
-                              Store 513(sizeQueryTemp) 518
-             519:     13(ptr) AccessChain 513(sizeQueryTemp) 67
+                              Store 69(ElementsU) 508
+             509:         498 Load 500(g_tTex2dmsi4a)
+             510:     12(int) ImageQuerySamples 509
+                              Store 456(NumberOfSamplesU) 510
+             515:         512 Load 514(g_tTex2dmsu4a)
+             516:  178(ivec3) ImageQuerySize 515
+                              Store 511(sizeQueryTemp) 516
+             517:     13(ptr) AccessChain 511(sizeQueryTemp) 66
+             518:     12(int) Load 517
+                              Store 22(WidthU) 518
+             519:     13(ptr) AccessChain 511(sizeQueryTemp) 70
              520:     12(int) Load 519
-                              Store 22(WidthU) 520
-             521:     13(ptr) AccessChain 513(sizeQueryTemp) 71
+                              Store 128(HeightU) 520
+             521:     13(ptr) AccessChain 511(sizeQueryTemp) 190
              522:     12(int) Load 521
-                              Store 129(HeightU) 522
-             523:     13(ptr) AccessChain 513(sizeQueryTemp) 192
-             524:     12(int) Load 523
-                              Store 70(ElementsU) 524
-             525:         514 Load 516(g_tTex2dmsu4a)
-             526:     19(int) ImageQuerySamples 525
-                              Store 458(NumberOfSamplesU) 526
-             532:    531(ptr) AccessChain 528(psout) 20
-                              Store 532 530
-             535:    534(ptr) AccessChain 528(psout) 533
-                              Store 535 529
-             536:8(PS_OUTPUT) Load 528(psout)
-                              ReturnValue 536
+                              Store 69(ElementsU) 522
+             523:         512 Load 514(g_tTex2dmsu4a)
+             524:     12(int) ImageQuerySamples 523
+                              Store 456(NumberOfSamplesU) 524
+             530:    529(ptr) AccessChain 526(psout) 20
+                              Store 530 528
+             533:    532(ptr) AccessChain 526(psout) 531
+                              Store 533 527
+             534:8(PS_OUTPUT) Load 526(psout)
+                              ReturnValue 534
                               FunctionEnd
diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out
index 8785ca6..b772154 100644
--- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out
@@ -186,17 +186,17 @@
 29(NumberOfLevelsU):     13(ptr) Variable Function
        33(vsout):     32(ptr) Variable Function
               18:          15 Load 17(g_tTex1df4)
-              21:     19(int) ImageQuerySizeLod 18 20
+              21:     12(int) ImageQuerySizeLod 18 20
                               Store 14(sizeQueryTemp) 21
               23:     12(int) Load 14(sizeQueryTemp)
                               Store 22(WidthU) 23
               25:          15 Load 17(g_tTex1df4)
-              27:     19(int) ImageQuerySizeLod 25 26
+              27:     12(int) ImageQuerySizeLod 25 26
                               Store 24(sizeQueryTemp) 27
               28:     12(int) Load 24(sizeQueryTemp)
                               Store 22(WidthU) 28
               30:          15 Load 17(g_tTex1df4)
-              31:     19(int) ImageQueryLevels 30
+              31:     12(int) ImageQueryLevels 30
                               Store 29(NumberOfLevelsU) 31
               37:     36(ptr) AccessChain 33(vsout) 20
                               Store 37 35
diff --git a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
index 543ba94..c0309de 100644
--- a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
@@ -725,7 +725,7 @@
                               Capability ImageQuery
                1:             ExtInstImport  "GLSL.std.450"
                               MemoryModel Logical GLSL450
-                              EntryPoint Fragment 4  "main" 218 222
+                              EntryPoint Fragment 4  "main" 216 220
                               ExecutionMode 4 OriginUpperLeft
                               Name 4  "main"
                               Name 8  "PS_OUTPUT"
@@ -734,8 +734,8 @@
                               Name 10  "@main("
                               Name 14  "sizeQueryTemp"
                               Name 17  "g_tTex1df4"
-                              Name 21  "WidthU"
-                              Name 23  "sizeQueryTemp"
+                              Name 20  "WidthU"
+                              Name 22  "sizeQueryTemp"
                               Name 26  "g_tTex1di4"
                               Name 30  "sizeQueryTemp"
                               Name 33  "g_tTex1du4"
@@ -747,36 +747,36 @@
                               Name 54  "g_tBuffU"
                               Name 60  "sizeQueryTemp"
                               Name 63  "g_tTex1df4a"
-                              Name 70  "ElementsU"
-                              Name 74  "sizeQueryTemp"
-                              Name 77  "g_tTex1di4a"
-                              Name 84  "sizeQueryTemp"
-                              Name 87  "g_tTex1du4a"
-                              Name 94  "sizeQueryTemp"
-                              Name 97  "g_tTex2df4"
-                              Name 102  "HeightU"
-                              Name 105  "sizeQueryTemp"
-                              Name 108  "g_tTex2di4"
-                              Name 115  "sizeQueryTemp"
-                              Name 118  "g_tTex2du4"
-                              Name 127  "sizeQueryTemp"
-                              Name 130  "g_tTex2df4a"
-                              Name 141  "sizeQueryTemp"
-                              Name 144  "g_tTex2di4a"
-                              Name 153  "sizeQueryTemp"
-                              Name 156  "g_tTex2du4a"
-                              Name 165  "sizeQueryTemp"
-                              Name 168  "g_tTex3df4"
-                              Name 175  "DepthU"
-                              Name 178  "sizeQueryTemp"
-                              Name 181  "g_tTex3di4"
-                              Name 190  "sizeQueryTemp"
-                              Name 193  "g_tTex3du4"
-                              Name 203  "psout"
-                              Name 215  "flattenTemp"
-                              Name 218  "Color"
-                              Name 222  "Depth"
-                              Name 227  "g_sSamp"
+                              Name 69  "ElementsU"
+                              Name 73  "sizeQueryTemp"
+                              Name 76  "g_tTex1di4a"
+                              Name 83  "sizeQueryTemp"
+                              Name 86  "g_tTex1du4a"
+                              Name 93  "sizeQueryTemp"
+                              Name 96  "g_tTex2df4"
+                              Name 101  "HeightU"
+                              Name 104  "sizeQueryTemp"
+                              Name 107  "g_tTex2di4"
+                              Name 114  "sizeQueryTemp"
+                              Name 117  "g_tTex2du4"
+                              Name 126  "sizeQueryTemp"
+                              Name 129  "g_tTex2df4a"
+                              Name 139  "sizeQueryTemp"
+                              Name 142  "g_tTex2di4a"
+                              Name 151  "sizeQueryTemp"
+                              Name 154  "g_tTex2du4a"
+                              Name 163  "sizeQueryTemp"
+                              Name 166  "g_tTex3df4"
+                              Name 173  "DepthU"
+                              Name 176  "sizeQueryTemp"
+                              Name 179  "g_tTex3di4"
+                              Name 188  "sizeQueryTemp"
+                              Name 191  "g_tTex3du4"
+                              Name 201  "psout"
+                              Name 213  "flattenTemp"
+                              Name 216  "Color"
+                              Name 220  "Depth"
+                              Name 225  "g_sSamp"
                               Name 229  "$Global"
                               MemberName 229($Global) 0  "c1"
                               MemberName 229($Global) 1  "c2"
@@ -795,21 +795,21 @@
                               Decorate 47(g_tBuffI) DescriptorSet 0
                               Decorate 54(g_tBuffU) DescriptorSet 0
                               Decorate 63(g_tTex1df4a) DescriptorSet 0
-                              Decorate 77(g_tTex1di4a) DescriptorSet 0
-                              Decorate 87(g_tTex1du4a) DescriptorSet 0
-                              Decorate 97(g_tTex2df4) DescriptorSet 0
-                              Decorate 108(g_tTex2di4) DescriptorSet 0
-                              Decorate 118(g_tTex2du4) DescriptorSet 0
-                              Decorate 130(g_tTex2df4a) DescriptorSet 0
-                              Decorate 144(g_tTex2di4a) DescriptorSet 0
-                              Decorate 156(g_tTex2du4a) DescriptorSet 0
-                              Decorate 168(g_tTex3df4) DescriptorSet 0
-                              Decorate 181(g_tTex3di4) DescriptorSet 0
-                              Decorate 193(g_tTex3du4) DescriptorSet 0
-                              Decorate 218(Color) Location 0
-                              Decorate 222(Depth) BuiltIn FragDepth
-                              Decorate 227(g_sSamp) DescriptorSet 0
-                              Decorate 227(g_sSamp) Binding 0
+                              Decorate 76(g_tTex1di4a) DescriptorSet 0
+                              Decorate 86(g_tTex1du4a) DescriptorSet 0
+                              Decorate 96(g_tTex2df4) DescriptorSet 0
+                              Decorate 107(g_tTex2di4) DescriptorSet 0
+                              Decorate 117(g_tTex2du4) DescriptorSet 0
+                              Decorate 129(g_tTex2df4a) DescriptorSet 0
+                              Decorate 142(g_tTex2di4a) DescriptorSet 0
+                              Decorate 154(g_tTex2du4a) DescriptorSet 0
+                              Decorate 166(g_tTex3df4) DescriptorSet 0
+                              Decorate 179(g_tTex3di4) DescriptorSet 0
+                              Decorate 191(g_tTex3du4) DescriptorSet 0
+                              Decorate 216(Color) Location 0
+                              Decorate 220(Depth) BuiltIn FragDepth
+                              Decorate 225(g_sSamp) DescriptorSet 0
+                              Decorate 225(g_sSamp) Binding 0
                               MemberDecorate 229($Global) 0 Offset 0
                               MemberDecorate 229($Global) 1 Offset 8
                               MemberDecorate 229($Global) 2 Offset 16
@@ -831,8 +831,8 @@
               15:             TypeImage 6(float) 1D nonsampled format:Rgba32f
               16:             TypePointer UniformConstant 15
   17(g_tTex1df4):     16(ptr) Variable UniformConstant
-              19:             TypeInt 32 1
-              24:             TypeImage 19(int) 1D nonsampled format:Rgba32i
+              23:             TypeInt 32 1
+              24:             TypeImage 23(int) 1D nonsampled format:Rgba32i
               25:             TypePointer UniformConstant 24
   26(g_tTex1di4):     25(ptr) Variable UniformConstant
               31:             TypeImage 12(int) 1D nonsampled format:Rgba32ui
@@ -841,7 +841,7 @@
               38:             TypeImage 6(float) Buffer nonsampled format:Rgba32f
               39:             TypePointer UniformConstant 38
     40(g_tBuffF):     39(ptr) Variable UniformConstant
-              45:             TypeImage 19(int) Buffer nonsampled format:Rgba32i
+              45:             TypeImage 23(int) Buffer nonsampled format:Rgba32i
               46:             TypePointer UniformConstant 45
     47(g_tBuffI):     46(ptr) Variable UniformConstant
               52:             TypeImage 12(int) Buffer nonsampled format:Rgba32ui
@@ -852,262 +852,262 @@
               61:             TypeImage 6(float) 1D array nonsampled format:Rgba32f
               62:             TypePointer UniformConstant 61
  63(g_tTex1df4a):     62(ptr) Variable UniformConstant
-              65:             TypeVector 19(int) 2
-              67:     12(int) Constant 0
-              71:     12(int) Constant 1
-              75:             TypeImage 19(int) 1D array nonsampled format:Rgba32i
-              76:             TypePointer UniformConstant 75
- 77(g_tTex1di4a):     76(ptr) Variable UniformConstant
-              85:             TypeImage 12(int) 1D array nonsampled format:Rgba32ui
-              86:             TypePointer UniformConstant 85
- 87(g_tTex1du4a):     86(ptr) Variable UniformConstant
-              95:             TypeImage 6(float) 2D nonsampled format:Rgba32f
-              96:             TypePointer UniformConstant 95
-  97(g_tTex2df4):     96(ptr) Variable UniformConstant
-             106:             TypeImage 19(int) 2D nonsampled format:Rgba32i
-             107:             TypePointer UniformConstant 106
- 108(g_tTex2di4):    107(ptr) Variable UniformConstant
-             116:             TypeImage 12(int) 2D nonsampled format:Rgba32ui
-             117:             TypePointer UniformConstant 116
- 118(g_tTex2du4):    117(ptr) Variable UniformConstant
-             125:             TypeVector 12(int) 3
-             126:             TypePointer Function 125(ivec3)
-             128:             TypeImage 6(float) 2D array nonsampled format:Rgba32f
-             129:             TypePointer UniformConstant 128
-130(g_tTex2df4a):    129(ptr) Variable UniformConstant
-             132:             TypeVector 19(int) 3
-             138:     12(int) Constant 2
-             142:             TypeImage 19(int) 2D array nonsampled format:Rgba32i
-             143:             TypePointer UniformConstant 142
-144(g_tTex2di4a):    143(ptr) Variable UniformConstant
-             154:             TypeImage 12(int) 2D array nonsampled format:Rgba32ui
-             155:             TypePointer UniformConstant 154
-156(g_tTex2du4a):    155(ptr) Variable UniformConstant
-             166:             TypeImage 6(float) 3D nonsampled format:Rgba32f
-             167:             TypePointer UniformConstant 166
- 168(g_tTex3df4):    167(ptr) Variable UniformConstant
-             179:             TypeImage 19(int) 3D nonsampled format:Rgba32i
-             180:             TypePointer UniformConstant 179
- 181(g_tTex3di4):    180(ptr) Variable UniformConstant
-             191:             TypeImage 12(int) 3D nonsampled format:Rgba32ui
-             192:             TypePointer UniformConstant 191
- 193(g_tTex3du4):    192(ptr) Variable UniformConstant
-             202:             TypePointer Function 8(PS_OUTPUT)
-             204:     19(int) Constant 0
-             205:    6(float) Constant 1065353216
-             206:    7(fvec4) ConstantComposite 205 205 205 205
-             207:             TypePointer Function 7(fvec4)
-             209:     19(int) Constant 1
-             210:             TypePointer Function 6(float)
-             217:             TypePointer Output 7(fvec4)
-      218(Color):    217(ptr) Variable Output
-             221:             TypePointer Output 6(float)
-      222(Depth):    221(ptr) Variable Output
-             225:             TypeSampler
-             226:             TypePointer UniformConstant 225
-    227(g_sSamp):    226(ptr) Variable UniformConstant
-             228:             TypeVector 19(int) 4
-    229($Global):             TypeStruct 19(int) 65(ivec2) 132(ivec3) 228(ivec4) 19(int) 65(ivec2) 132(ivec3) 228(ivec4)
+              66:     12(int) Constant 0
+              70:     12(int) Constant 1
+              74:             TypeImage 23(int) 1D array nonsampled format:Rgba32i
+              75:             TypePointer UniformConstant 74
+ 76(g_tTex1di4a):     75(ptr) Variable UniformConstant
+              84:             TypeImage 12(int) 1D array nonsampled format:Rgba32ui
+              85:             TypePointer UniformConstant 84
+ 86(g_tTex1du4a):     85(ptr) Variable UniformConstant
+              94:             TypeImage 6(float) 2D nonsampled format:Rgba32f
+              95:             TypePointer UniformConstant 94
+  96(g_tTex2df4):     95(ptr) Variable UniformConstant
+             105:             TypeImage 23(int) 2D nonsampled format:Rgba32i
+             106:             TypePointer UniformConstant 105
+ 107(g_tTex2di4):    106(ptr) Variable UniformConstant
+             115:             TypeImage 12(int) 2D nonsampled format:Rgba32ui
+             116:             TypePointer UniformConstant 115
+ 117(g_tTex2du4):    116(ptr) Variable UniformConstant
+             124:             TypeVector 12(int) 3
+             125:             TypePointer Function 124(ivec3)
+             127:             TypeImage 6(float) 2D array nonsampled format:Rgba32f
+             128:             TypePointer UniformConstant 127
+129(g_tTex2df4a):    128(ptr) Variable UniformConstant
+             136:     12(int) Constant 2
+             140:             TypeImage 23(int) 2D array nonsampled format:Rgba32i
+             141:             TypePointer UniformConstant 140
+142(g_tTex2di4a):    141(ptr) Variable UniformConstant
+             152:             TypeImage 12(int) 2D array nonsampled format:Rgba32ui
+             153:             TypePointer UniformConstant 152
+154(g_tTex2du4a):    153(ptr) Variable UniformConstant
+             164:             TypeImage 6(float) 3D nonsampled format:Rgba32f
+             165:             TypePointer UniformConstant 164
+ 166(g_tTex3df4):    165(ptr) Variable UniformConstant
+             177:             TypeImage 23(int) 3D nonsampled format:Rgba32i
+             178:             TypePointer UniformConstant 177
+ 179(g_tTex3di4):    178(ptr) Variable UniformConstant
+             189:             TypeImage 12(int) 3D nonsampled format:Rgba32ui
+             190:             TypePointer UniformConstant 189
+ 191(g_tTex3du4):    190(ptr) Variable UniformConstant
+             200:             TypePointer Function 8(PS_OUTPUT)
+             202:     23(int) Constant 0
+             203:    6(float) Constant 1065353216
+             204:    7(fvec4) ConstantComposite 203 203 203 203
+             205:             TypePointer Function 7(fvec4)
+             207:     23(int) Constant 1
+             208:             TypePointer Function 6(float)
+             215:             TypePointer Output 7(fvec4)
+      216(Color):    215(ptr) Variable Output
+             219:             TypePointer Output 6(float)
+      220(Depth):    219(ptr) Variable Output
+             223:             TypeSampler
+             224:             TypePointer UniformConstant 223
+    225(g_sSamp):    224(ptr) Variable UniformConstant
+             226:             TypeVector 23(int) 2
+             227:             TypeVector 23(int) 3
+             228:             TypeVector 23(int) 4
+    229($Global):             TypeStruct 23(int) 226(ivec2) 227(ivec3) 228(ivec4) 23(int) 226(ivec2) 227(ivec3) 228(ivec4)
              230:             TypePointer Uniform 229($Global)
              231:    230(ptr) Variable Uniform
          4(main):           2 Function None 3
                5:             Label
-215(flattenTemp):    202(ptr) Variable Function
-             216:8(PS_OUTPUT) FunctionCall 10(@main()
-                              Store 215(flattenTemp) 216
-             219:    207(ptr) AccessChain 215(flattenTemp) 204
-             220:    7(fvec4) Load 219
-                              Store 218(Color) 220
-             223:    210(ptr) AccessChain 215(flattenTemp) 209
-             224:    6(float) Load 223
-                              Store 222(Depth) 224
+213(flattenTemp):    200(ptr) Variable Function
+             214:8(PS_OUTPUT) FunctionCall 10(@main()
+                              Store 213(flattenTemp) 214
+             217:    205(ptr) AccessChain 213(flattenTemp) 202
+             218:    7(fvec4) Load 217
+                              Store 216(Color) 218
+             221:    208(ptr) AccessChain 213(flattenTemp) 207
+             222:    6(float) Load 221
+                              Store 220(Depth) 222
                               Return
                               FunctionEnd
       10(@main():8(PS_OUTPUT) Function None 9
               11:             Label
 14(sizeQueryTemp):     13(ptr) Variable Function
-      21(WidthU):     13(ptr) Variable Function
-23(sizeQueryTemp):     13(ptr) Variable Function
+      20(WidthU):     13(ptr) Variable Function
+22(sizeQueryTemp):     13(ptr) Variable Function
 30(sizeQueryTemp):     13(ptr) Variable Function
 37(sizeQueryTemp):     13(ptr) Variable Function
 44(sizeQueryTemp):     13(ptr) Variable Function
 51(sizeQueryTemp):     13(ptr) Variable Function
 60(sizeQueryTemp):     59(ptr) Variable Function
-   70(ElementsU):     13(ptr) Variable Function
-74(sizeQueryTemp):     59(ptr) Variable Function
-84(sizeQueryTemp):     59(ptr) Variable Function
-94(sizeQueryTemp):     59(ptr) Variable Function
-    102(HeightU):     13(ptr) Variable Function
-105(sizeQueryTemp):     59(ptr) Variable Function
-115(sizeQueryTemp):     59(ptr) Variable Function
-127(sizeQueryTemp):    126(ptr) Variable Function
-141(sizeQueryTemp):    126(ptr) Variable Function
-153(sizeQueryTemp):    126(ptr) Variable Function
-165(sizeQueryTemp):    126(ptr) Variable Function
-     175(DepthU):     13(ptr) Variable Function
-178(sizeQueryTemp):    126(ptr) Variable Function
-190(sizeQueryTemp):    126(ptr) Variable Function
-      203(psout):    202(ptr) Variable Function
+   69(ElementsU):     13(ptr) Variable Function
+73(sizeQueryTemp):     59(ptr) Variable Function
+83(sizeQueryTemp):     59(ptr) Variable Function
+93(sizeQueryTemp):     59(ptr) Variable Function
+    101(HeightU):     13(ptr) Variable Function
+104(sizeQueryTemp):     59(ptr) Variable Function
+114(sizeQueryTemp):     59(ptr) Variable Function
+126(sizeQueryTemp):    125(ptr) Variable Function
+139(sizeQueryTemp):    125(ptr) Variable Function
+151(sizeQueryTemp):    125(ptr) Variable Function
+163(sizeQueryTemp):    125(ptr) Variable Function
+     173(DepthU):     13(ptr) Variable Function
+176(sizeQueryTemp):    125(ptr) Variable Function
+188(sizeQueryTemp):    125(ptr) Variable Function
+      201(psout):    200(ptr) Variable Function
               18:          15 Load 17(g_tTex1df4)
-              20:     19(int) ImageQuerySize 18
-                              Store 14(sizeQueryTemp) 20
-              22:     12(int) Load 14(sizeQueryTemp)
-                              Store 21(WidthU) 22
+              19:     12(int) ImageQuerySize 18
+                              Store 14(sizeQueryTemp) 19
+              21:     12(int) Load 14(sizeQueryTemp)
+                              Store 20(WidthU) 21
               27:          24 Load 26(g_tTex1di4)
-              28:     19(int) ImageQuerySize 27
-                              Store 23(sizeQueryTemp) 28
-              29:     12(int) Load 23(sizeQueryTemp)
-                              Store 21(WidthU) 29
+              28:     12(int) ImageQuerySize 27
+                              Store 22(sizeQueryTemp) 28
+              29:     12(int) Load 22(sizeQueryTemp)
+                              Store 20(WidthU) 29
               34:          31 Load 33(g_tTex1du4)
-              35:     19(int) ImageQuerySize 34
+              35:     12(int) ImageQuerySize 34
                               Store 30(sizeQueryTemp) 35
               36:     12(int) Load 30(sizeQueryTemp)
-                              Store 21(WidthU) 36
+                              Store 20(WidthU) 36
               41:          38 Load 40(g_tBuffF)
-              42:     19(int) ImageQuerySize 41
+              42:     12(int) ImageQuerySize 41
                               Store 37(sizeQueryTemp) 42
               43:     12(int) Load 37(sizeQueryTemp)
-                              Store 21(WidthU) 43
+                              Store 20(WidthU) 43
               48:          45 Load 47(g_tBuffI)
-              49:     19(int) ImageQuerySize 48
+              49:     12(int) ImageQuerySize 48
                               Store 44(sizeQueryTemp) 49
               50:     12(int) Load 44(sizeQueryTemp)
-                              Store 21(WidthU) 50
+                              Store 20(WidthU) 50
               55:          52 Load 54(g_tBuffU)
-              56:     19(int) ImageQuerySize 55
+              56:     12(int) ImageQuerySize 55
                               Store 51(sizeQueryTemp) 56
               57:     12(int) Load 51(sizeQueryTemp)
-                              Store 21(WidthU) 57
+                              Store 20(WidthU) 57
               64:          61 Load 63(g_tTex1df4a)
-              66:   65(ivec2) ImageQuerySize 64
-                              Store 60(sizeQueryTemp) 66
-              68:     13(ptr) AccessChain 60(sizeQueryTemp) 67
-              69:     12(int) Load 68
-                              Store 21(WidthU) 69
-              72:     13(ptr) AccessChain 60(sizeQueryTemp) 71
-              73:     12(int) Load 72
-                              Store 70(ElementsU) 73
-              78:          75 Load 77(g_tTex1di4a)
-              79:   65(ivec2) ImageQuerySize 78
-                              Store 74(sizeQueryTemp) 79
-              80:     13(ptr) AccessChain 74(sizeQueryTemp) 67
-              81:     12(int) Load 80
-                              Store 21(WidthU) 81
-              82:     13(ptr) AccessChain 74(sizeQueryTemp) 71
-              83:     12(int) Load 82
-                              Store 70(ElementsU) 83
-              88:          85 Load 87(g_tTex1du4a)
-              89:   65(ivec2) ImageQuerySize 88
-                              Store 84(sizeQueryTemp) 89
-              90:     13(ptr) AccessChain 84(sizeQueryTemp) 67
-              91:     12(int) Load 90
-                              Store 21(WidthU) 91
-              92:     13(ptr) AccessChain 84(sizeQueryTemp) 71
-              93:     12(int) Load 92
-                              Store 70(ElementsU) 93
-              98:          95 Load 97(g_tTex2df4)
-              99:   65(ivec2) ImageQuerySize 98
-                              Store 94(sizeQueryTemp) 99
-             100:     13(ptr) AccessChain 94(sizeQueryTemp) 67
-             101:     12(int) Load 100
-                              Store 21(WidthU) 101
-             103:     13(ptr) AccessChain 94(sizeQueryTemp) 71
-             104:     12(int) Load 103
-                              Store 102(HeightU) 104
-             109:         106 Load 108(g_tTex2di4)
-             110:   65(ivec2) ImageQuerySize 109
-                              Store 105(sizeQueryTemp) 110
-             111:     13(ptr) AccessChain 105(sizeQueryTemp) 67
-             112:     12(int) Load 111
-                              Store 21(WidthU) 112
-             113:     13(ptr) AccessChain 105(sizeQueryTemp) 71
-             114:     12(int) Load 113
-                              Store 102(HeightU) 114
-             119:         116 Load 118(g_tTex2du4)
-             120:   65(ivec2) ImageQuerySize 119
-                              Store 115(sizeQueryTemp) 120
-             121:     13(ptr) AccessChain 115(sizeQueryTemp) 67
-             122:     12(int) Load 121
-                              Store 21(WidthU) 122
-             123:     13(ptr) AccessChain 115(sizeQueryTemp) 71
-             124:     12(int) Load 123
-                              Store 102(HeightU) 124
-             131:         128 Load 130(g_tTex2df4a)
-             133:  132(ivec3) ImageQuerySize 131
-                              Store 127(sizeQueryTemp) 133
-             134:     13(ptr) AccessChain 127(sizeQueryTemp) 67
+              65:   58(ivec2) ImageQuerySize 64
+                              Store 60(sizeQueryTemp) 65
+              67:     13(ptr) AccessChain 60(sizeQueryTemp) 66
+              68:     12(int) Load 67
+                              Store 20(WidthU) 68
+              71:     13(ptr) AccessChain 60(sizeQueryTemp) 70
+              72:     12(int) Load 71
+                              Store 69(ElementsU) 72
+              77:          74 Load 76(g_tTex1di4a)
+              78:   58(ivec2) ImageQuerySize 77
+                              Store 73(sizeQueryTemp) 78
+              79:     13(ptr) AccessChain 73(sizeQueryTemp) 66
+              80:     12(int) Load 79
+                              Store 20(WidthU) 80
+              81:     13(ptr) AccessChain 73(sizeQueryTemp) 70
+              82:     12(int) Load 81
+                              Store 69(ElementsU) 82
+              87:          84 Load 86(g_tTex1du4a)
+              88:   58(ivec2) ImageQuerySize 87
+                              Store 83(sizeQueryTemp) 88
+              89:     13(ptr) AccessChain 83(sizeQueryTemp) 66
+              90:     12(int) Load 89
+                              Store 20(WidthU) 90
+              91:     13(ptr) AccessChain 83(sizeQueryTemp) 70
+              92:     12(int) Load 91
+                              Store 69(ElementsU) 92
+              97:          94 Load 96(g_tTex2df4)
+              98:   58(ivec2) ImageQuerySize 97
+                              Store 93(sizeQueryTemp) 98
+              99:     13(ptr) AccessChain 93(sizeQueryTemp) 66
+             100:     12(int) Load 99
+                              Store 20(WidthU) 100
+             102:     13(ptr) AccessChain 93(sizeQueryTemp) 70
+             103:     12(int) Load 102
+                              Store 101(HeightU) 103
+             108:         105 Load 107(g_tTex2di4)
+             109:   58(ivec2) ImageQuerySize 108
+                              Store 104(sizeQueryTemp) 109
+             110:     13(ptr) AccessChain 104(sizeQueryTemp) 66
+             111:     12(int) Load 110
+                              Store 20(WidthU) 111
+             112:     13(ptr) AccessChain 104(sizeQueryTemp) 70
+             113:     12(int) Load 112
+                              Store 101(HeightU) 113
+             118:         115 Load 117(g_tTex2du4)
+             119:   58(ivec2) ImageQuerySize 118
+                              Store 114(sizeQueryTemp) 119
+             120:     13(ptr) AccessChain 114(sizeQueryTemp) 66
+             121:     12(int) Load 120
+                              Store 20(WidthU) 121
+             122:     13(ptr) AccessChain 114(sizeQueryTemp) 70
+             123:     12(int) Load 122
+                              Store 101(HeightU) 123
+             130:         127 Load 129(g_tTex2df4a)
+             131:  124(ivec3) ImageQuerySize 130
+                              Store 126(sizeQueryTemp) 131
+             132:     13(ptr) AccessChain 126(sizeQueryTemp) 66
+             133:     12(int) Load 132
+                              Store 20(WidthU) 133
+             134:     13(ptr) AccessChain 126(sizeQueryTemp) 70
              135:     12(int) Load 134
-                              Store 21(WidthU) 135
-             136:     13(ptr) AccessChain 127(sizeQueryTemp) 71
-             137:     12(int) Load 136
-                              Store 102(HeightU) 137
-             139:     13(ptr) AccessChain 127(sizeQueryTemp) 138
-             140:     12(int) Load 139
-                              Store 70(ElementsU) 140
-             145:         142 Load 144(g_tTex2di4a)
-             146:  132(ivec3) ImageQuerySize 145
-                              Store 141(sizeQueryTemp) 146
-             147:     13(ptr) AccessChain 141(sizeQueryTemp) 67
+                              Store 101(HeightU) 135
+             137:     13(ptr) AccessChain 126(sizeQueryTemp) 136
+             138:     12(int) Load 137
+                              Store 69(ElementsU) 138
+             143:         140 Load 142(g_tTex2di4a)
+             144:  124(ivec3) ImageQuerySize 143
+                              Store 139(sizeQueryTemp) 144
+             145:     13(ptr) AccessChain 139(sizeQueryTemp) 66
+             146:     12(int) Load 145
+                              Store 20(WidthU) 146
+             147:     13(ptr) AccessChain 139(sizeQueryTemp) 70
              148:     12(int) Load 147
-                              Store 21(WidthU) 148
-             149:     13(ptr) AccessChain 141(sizeQueryTemp) 71
+                              Store 101(HeightU) 148
+             149:     13(ptr) AccessChain 139(sizeQueryTemp) 136
              150:     12(int) Load 149
-                              Store 102(HeightU) 150
-             151:     13(ptr) AccessChain 141(sizeQueryTemp) 138
-             152:     12(int) Load 151
-                              Store 70(ElementsU) 152
-             157:         154 Load 156(g_tTex2du4a)
-             158:  132(ivec3) ImageQuerySize 157
-                              Store 153(sizeQueryTemp) 158
-             159:     13(ptr) AccessChain 153(sizeQueryTemp) 67
+                              Store 69(ElementsU) 150
+             155:         152 Load 154(g_tTex2du4a)
+             156:  124(ivec3) ImageQuerySize 155
+                              Store 151(sizeQueryTemp) 156
+             157:     13(ptr) AccessChain 151(sizeQueryTemp) 66
+             158:     12(int) Load 157
+                              Store 20(WidthU) 158
+             159:     13(ptr) AccessChain 151(sizeQueryTemp) 70
              160:     12(int) Load 159
-                              Store 21(WidthU) 160
-             161:     13(ptr) AccessChain 153(sizeQueryTemp) 71
+                              Store 101(HeightU) 160
+             161:     13(ptr) AccessChain 151(sizeQueryTemp) 136
              162:     12(int) Load 161
-                              Store 102(HeightU) 162
-             163:     13(ptr) AccessChain 153(sizeQueryTemp) 138
-             164:     12(int) Load 163
-                              Store 70(ElementsU) 164
-             169:         166 Load 168(g_tTex3df4)
-             170:  132(ivec3) ImageQuerySize 169
-                              Store 165(sizeQueryTemp) 170
-             171:     13(ptr) AccessChain 165(sizeQueryTemp) 67
+                              Store 69(ElementsU) 162
+             167:         164 Load 166(g_tTex3df4)
+             168:  124(ivec3) ImageQuerySize 167
+                              Store 163(sizeQueryTemp) 168
+             169:     13(ptr) AccessChain 163(sizeQueryTemp) 66
+             170:     12(int) Load 169
+                              Store 20(WidthU) 170
+             171:     13(ptr) AccessChain 163(sizeQueryTemp) 70
              172:     12(int) Load 171
-                              Store 21(WidthU) 172
-             173:     13(ptr) AccessChain 165(sizeQueryTemp) 71
-             174:     12(int) Load 173
-                              Store 102(HeightU) 174
-             176:     13(ptr) AccessChain 165(sizeQueryTemp) 138
-             177:     12(int) Load 176
-                              Store 175(DepthU) 177
-             182:         179 Load 181(g_tTex3di4)
-             183:  132(ivec3) ImageQuerySize 182
-                              Store 178(sizeQueryTemp) 183
-             184:     13(ptr) AccessChain 178(sizeQueryTemp) 67
+                              Store 101(HeightU) 172
+             174:     13(ptr) AccessChain 163(sizeQueryTemp) 136
+             175:     12(int) Load 174
+                              Store 173(DepthU) 175
+             180:         177 Load 179(g_tTex3di4)
+             181:  124(ivec3) ImageQuerySize 180
+                              Store 176(sizeQueryTemp) 181
+             182:     13(ptr) AccessChain 176(sizeQueryTemp) 66
+             183:     12(int) Load 182
+                              Store 20(WidthU) 183
+             184:     13(ptr) AccessChain 176(sizeQueryTemp) 70
              185:     12(int) Load 184
-                              Store 21(WidthU) 185
-             186:     13(ptr) AccessChain 178(sizeQueryTemp) 71
+                              Store 101(HeightU) 185
+             186:     13(ptr) AccessChain 176(sizeQueryTemp) 136
              187:     12(int) Load 186
-                              Store 102(HeightU) 187
-             188:     13(ptr) AccessChain 178(sizeQueryTemp) 138
-             189:     12(int) Load 188
-                              Store 175(DepthU) 189
-             194:         191 Load 193(g_tTex3du4)
-             195:  132(ivec3) ImageQuerySize 194
-                              Store 190(sizeQueryTemp) 195
-             196:     13(ptr) AccessChain 190(sizeQueryTemp) 67
+                              Store 173(DepthU) 187
+             192:         189 Load 191(g_tTex3du4)
+             193:  124(ivec3) ImageQuerySize 192
+                              Store 188(sizeQueryTemp) 193
+             194:     13(ptr) AccessChain 188(sizeQueryTemp) 66
+             195:     12(int) Load 194
+                              Store 20(WidthU) 195
+             196:     13(ptr) AccessChain 188(sizeQueryTemp) 70
              197:     12(int) Load 196
-                              Store 21(WidthU) 197
-             198:     13(ptr) AccessChain 190(sizeQueryTemp) 71
+                              Store 101(HeightU) 197
+             198:     13(ptr) AccessChain 188(sizeQueryTemp) 136
              199:     12(int) Load 198
-                              Store 102(HeightU) 199
-             200:     13(ptr) AccessChain 190(sizeQueryTemp) 138
-             201:     12(int) Load 200
-                              Store 175(DepthU) 201
-             208:    207(ptr) AccessChain 203(psout) 204
-                              Store 208 206
-             211:    210(ptr) AccessChain 203(psout) 209
-                              Store 211 205
-             212:8(PS_OUTPUT) Load 203(psout)
-                              ReturnValue 212
+                              Store 173(DepthU) 199
+             206:    205(ptr) AccessChain 201(psout) 202
+                              Store 206 204
+             209:    208(ptr) AccessChain 201(psout) 207
+                              Store 209 203
+             210:8(PS_OUTPUT) Load 201(psout)
+                              ReturnValue 210
                               FunctionEnd
diff --git a/Test/baseResults/hlsl.intrinsics.promote.frag.out b/Test/baseResults/hlsl.intrinsics.promote.frag.out
index 540fe2e..7450721 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.frag.out
@@ -1288,37 +1288,37 @@
              276:    6(float) CompositeExtract 275 0
                               Store 268(r51) 276
              281:         278 Load 280(g_tTex1df4)
-             282:     14(int) ImageQuerySizeLod 281 53
+             282:     15(int) ImageQuerySizeLod 281 53
                               Store 277(sizeQueryTemp) 282
              284:     15(int) Load 277(sizeQueryTemp)
              285:     14(int) Bitcast 284
                               Store 283(WidthI) 285
              287:         278 Load 280(g_tTex1df4)
-             289:     14(int) ImageQuerySizeLod 287 288
+             289:     15(int) ImageQuerySizeLod 287 288
                               Store 286(sizeQueryTemp) 289
              290:     15(int) Load 286(sizeQueryTemp)
              291:     14(int) Bitcast 290
                               Store 283(WidthI) 291
              293:         278 Load 280(g_tTex1df4)
-             294:     14(int) ImageQueryLevels 293
+             294:     15(int) ImageQueryLevels 293
                               Store 292(NumberOfLevelsU) 294
              296:         278 Load 280(g_tTex1df4)
-             297:     14(int) ImageQuerySizeLod 296 288
+             297:     15(int) ImageQuerySizeLod 296 288
                               Store 295(sizeQueryTemp) 297
              299:     15(int) Load 295(sizeQueryTemp)
                               Store 298(WidthU) 299
              301:         278 Load 280(g_tTex1df4)
-             302:     14(int) ImageQueryLevels 301
+             302:     15(int) ImageQueryLevels 301
              303:     14(int) Bitcast 302
                               Store 300(NumberOfLevelsI) 303
              305:         278 Load 280(g_tTex1df4)
-             306:     14(int) ImageQuerySizeLod 305 288
+             306:     15(int) ImageQuerySizeLod 305 288
                               Store 304(sizeQueryTemp) 306
              307:     15(int) Load 304(sizeQueryTemp)
              308:     14(int) Bitcast 307
                               Store 283(WidthI) 308
              309:         278 Load 280(g_tTex1df4)
-             310:     14(int) ImageQueryLevels 309
+             310:     15(int) ImageQueryLevels 309
              311:     14(int) Bitcast 310
                               Store 300(NumberOfLevelsI) 311
              314:    6(float) Load 13(r00)
diff --git a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
index 9ed9831..05edba4 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
@@ -314,37 +314,37 @@
               23:    6(float) Load 22
               26:    6(float) ExtInst 1(GLSL.std.450) 43(FClamp) 23 24 25
               32:          29 Load 31(g_tTex1df4)
-              34:     12(int) ImageQuerySizeLod 32 33
+              34:     13(int) ImageQuerySizeLod 32 33
                               Store 28(sizeQueryTemp) 34
               37:     13(int) Load 28(sizeQueryTemp)
               38:     12(int) Bitcast 37
                               Store 36(WidthI) 38
               40:          29 Load 31(g_tTex1df4)
-              42:     12(int) ImageQuerySizeLod 40 41
+              42:     13(int) ImageQuerySizeLod 40 41
                               Store 39(sizeQueryTemp) 42
               43:     13(int) Load 39(sizeQueryTemp)
               44:     12(int) Bitcast 43
                               Store 36(WidthI) 44
               46:          29 Load 31(g_tTex1df4)
-              47:     12(int) ImageQueryLevels 46
+              47:     13(int) ImageQueryLevels 46
                               Store 45(NumberOfLevelsU) 47
               49:          29 Load 31(g_tTex1df4)
-              50:     12(int) ImageQuerySizeLod 49 41
+              50:     13(int) ImageQuerySizeLod 49 41
                               Store 48(sizeQueryTemp) 50
               52:     13(int) Load 48(sizeQueryTemp)
                               Store 51(WidthU) 52
               54:          29 Load 31(g_tTex1df4)
-              55:     12(int) ImageQueryLevels 54
+              55:     13(int) ImageQueryLevels 54
               56:     12(int) Bitcast 55
                               Store 53(NumberOfLevelsI) 56
               58:          29 Load 31(g_tTex1df4)
-              59:     12(int) ImageQuerySizeLod 58 41
+              59:     13(int) ImageQuerySizeLod 58 41
                               Store 57(sizeQueryTemp) 59
               60:     13(int) Load 57(sizeQueryTemp)
               61:     12(int) Bitcast 60
                               Store 36(WidthI) 61
               62:          29 Load 31(g_tTex1df4)
-              63:     12(int) ImageQueryLevels 62
+              63:     13(int) ImageQueryLevels 62
               64:     12(int) Bitcast 63
                               Store 53(NumberOfLevelsI) 64
               69:     68(ptr) AccessChain 66(ps_output) 33