GLSL/SPV: If a texture is used with a shadow sampler, force 'shadow'.

Fixes #854. But, only good if we are not trying to use the same texture for both shadow and non-shadow constructors. Force the type of the texture to have 'shadow' set when it is constructed with a samplerShadow.

GLSL/SPV: If a texture is used with a shadow sampler, force 'shadow'.
0339af3c · John Kessenich · fa4952c3 · 0339af3c · 0339af3c
Commit 0339af3c authored Jul 20, 2018 by John Kessenich
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

spv.separate.frag.out Test/baseResults/spv.separate.frag.out +0 -0

ParseHelper.cpp glslang/MachineIndependent/ParseHelper.cpp +7 -1

No files found.
--- a/Test/baseResults/spv.separate.frag.out
+++ b/Test/baseResults/spv.separate.frag.out
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -5917,8 +5917,14 @@ TIntermTyped* TParseContext::addConstructor(const TSourceLoc& loc, TIntermNode* 
    // Combined texture-sampler constructors are completely semantic checked
    // in constructorTextureSamplerError()
-    if (op == EOpConstructTextureSampler)
+    if (op == EOpConstructTextureSampler) {
+        if (aggrNode->getSequence()[1]->getAsTyped()->getType().getSampler().shadow) {
+            // Transfer depth into the texture (SPIR-V image) type, as a hint
+            // for tools to know this texture/image is a depth image.
+            aggrNode->getSequence()[0]->getAsTyped()->getWritableType().getSampler().shadow = true;
+        }
        return intermediate.setAggregateOperator(aggrNode, op, type, loc);
+    }
    TTypeList::const_iterator memberTypes;
    if (op == EOpConstructStruct)