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: