Merge pull request #416 from steve-lunarg/samplers.calclod

Test/baseResults/hlsl.getsampleposition.dx10.frag.out

+hlsl.getsampleposition.dx10.frag
+ERROR: 0:16: '' : unimplemented: GetSamplePosition 
+ERROR: 0:17: '' : unimplemented: GetSamplePosition 
+ERROR: 2 compilation errors.  No code generated.
+
+
+Shader version: 450
+gl_FragCoord origin is upper left
+ERROR: node is still EOpNull!
+0:24  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:13    Function Parameters: 
+0:?     Sequence
+0:16      Sequence
+0:16        move second child to first child (temp 2-component vector of float)
+0:16          'r00' (temp 2-component vector of float)
+0:16          ERROR: Bad aggregation op
+ (global 2-component vector of float)
+0:16            'g_tTex2dmsf4' (uniform texture2DMS)
+0:16            Constant:
+0:16              1 (const int)
+0:17      Sequence
+0:17        move second child to first child (temp 2-component vector of float)
+0:17          'r01' (temp 2-component vector of float)
+0:17          ERROR: Bad aggregation op
+ (global 2-component vector of float)
+0:17            'g_tTex2dmsf4a' (uniform texture2DMSArray)
+0:17            Constant:
+0:17              2 (const int)
+0:20      move second child to first child (temp float)
+0:20        Depth: direct index for structure (temp float FragDepth)
+0:20          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:20          Constant:
+0:20            1 (const int)
+0:20        Constant:
+0:20          1.000000
+0:22      Branch: Return with expression
+0:22        'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?   Linker Objects
+0:?     'g_sSamp' (uniform sampler)
+0:?     'g_tTex2dmsf4' (uniform texture2DMS)
+0:?     'g_tTex2dmsf4a' (uniform texture2DMSArray)
+
+
+Linked fragment stage:
+
+
+Shader version: 450
+gl_FragCoord origin is upper left
+ERROR: node is still EOpNull!
+0:24  Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:13    Function Parameters: 
+0:?     Sequence
+0:16      Sequence
+0:16        move second child to first child (temp 2-component vector of float)
+0:16          'r00' (temp 2-component vector of float)
+0:16          ERROR: Bad aggregation op
+ (global 2-component vector of float)
+0:16            'g_tTex2dmsf4' (uniform texture2DMS)
+0:16            Constant:
+0:16              1 (const int)
+0:17      Sequence
+0:17        move second child to first child (temp 2-component vector of float)
+0:17          'r01' (temp 2-component vector of float)
+0:17          ERROR: Bad aggregation op
+ (global 2-component vector of float)
+0:17            'g_tTex2dmsf4a' (uniform texture2DMSArray)
+0:17            Constant:
+0:17              2 (const int)
+0:20      move second child to first child (temp float)
+0:20        Depth: direct index for structure (temp float FragDepth)
+0:20          'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:20          Constant:
+0:20            1 (const int)
+0:20        Constant:
+0:20          1.000000
+0:22      Branch: Return with expression
+0:22        'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
+0:?   Linker Objects
+0:?     'g_sSamp' (uniform sampler)
+0:?     'g_tTex2dmsf4' (uniform texture2DMS)
+0:?     'g_tTex2dmsf4a' (uniform texture2DMSArray)
+
+SPIR-V is not generated for failed compile or link

Test/hlsl.calculatelod.dx10.frag

+SamplerState       g_sSamp : register(s0);
+
+Texture1DArray          g_tTex1df4a : register(t1);
+
+uniform Texture1DArray <float4> g_tTex1df4 : register(t0);
+Texture1DArray <int4>   g_tTex1di4a;
+Texture1DArray <uint4>  g_tTex1du4a;
+
+Texture2DArray <float4> g_tTex2df4a;
+Texture2DArray <int4>   g_tTex2di4a;
+Texture2DArray <uint4>  g_tTex2du4a;
+
+TextureCubeArray <float4> g_tTexcdf4a;
+TextureCubeArray <int4>   g_tTexcdi4a;
+TextureCubeArray <uint4>  g_tTexcdu4a;
+
+struct PS_OUTPUT
+{
+    float4 Color : SV_Target0;
+    float  Depth : SV_Depth;
+};
+
+PS_OUTPUT main()
+{
+   PS_OUTPUT psout;
+
+   // LOD queries do not pass array level in coordinate.
+   float txval10 = g_tTex1df4a . CalculateLevelOfDetail(g_sSamp, 0.1);
+   float txval11 = g_tTex1di4a . CalculateLevelOfDetail(g_sSamp, 0.2);
+   float txval12 = g_tTex1du4a . CalculateLevelOfDetail(g_sSamp, 0.3);
+
+   float txval20 = g_tTex2df4a . CalculateLevelOfDetail(g_sSamp, float2(0.1, 0.2));
+   float txval21 = g_tTex2di4a . CalculateLevelOfDetail(g_sSamp, float2(0.3, 0.4));
+   float txval22 = g_tTex2du4a . CalculateLevelOfDetail(g_sSamp, float2(0.5, 0.6));
+
+   float txval40 = g_tTexcdf4a . CalculateLevelOfDetail(g_sSamp, float3(0.1, 0.2, 0.3));
+   float txval41 = g_tTexcdi4a . CalculateLevelOfDetail(g_sSamp, float3(0.4, 0.5, 0.6));
+   float txval42 = g_tTexcdu4a . CalculateLevelOfDetail(g_sSamp, float3(0.7, 0.8, 0.9));
+
+   psout.Color = 1.0;
+   psout.Depth = 1.0;
+
+   return psout;
+}

Test/hlsl.calculatelodunclamped.dx10.frag

+SamplerState       g_sSamp : register(s0);
+
+Texture1DArray          g_tTex1df4a : register(t1);
+
+uniform Texture1DArray <float4> g_tTex1df4 : register(t0);
+Texture1DArray <int4>   g_tTex1di4a;
+Texture1DArray <uint4>  g_tTex1du4a;
+
+Texture2DArray <float4> g_tTex2df4a;
+Texture2DArray <int4>   g_tTex2di4a;
+Texture2DArray <uint4>  g_tTex2du4a;
+
+TextureCubeArray <float4> g_tTexcdf4a;
+TextureCubeArray <int4>   g_tTexcdi4a;
+TextureCubeArray <uint4>  g_tTexcdu4a;
+
+struct PS_OUTPUT
+{
+    float4 Color : SV_Target0;
+    float  Depth : SV_Depth;
+};
+
+PS_OUTPUT main()
+{
+   PS_OUTPUT psout;
+
+   // LOD queries do not pass array level in coordinate.
+   float txval10 = g_tTex1df4a . CalculateLevelOfDetailUnclamped(g_sSamp, 0.1);
+   float txval11 = g_tTex1di4a . CalculateLevelOfDetailUnclamped(g_sSamp, 0.2);
+   float txval12 = g_tTex1du4a . CalculateLevelOfDetailUnclamped(g_sSamp, 0.3);
+
+   float txval20 = g_tTex2df4a . CalculateLevelOfDetailUnclamped(g_sSamp, float2(0.1, 0.2));
+   float txval21 = g_tTex2di4a . CalculateLevelOfDetailUnclamped(g_sSamp, float2(0.3, 0.4));
+   float txval22 = g_tTex2du4a . CalculateLevelOfDetailUnclamped(g_sSamp, float2(0.5, 0.6));
+
+   float txval40 = g_tTexcdf4a . CalculateLevelOfDetailUnclamped(g_sSamp, float3(0.1, 0.2, 0.3));
+   float txval41 = g_tTexcdi4a . CalculateLevelOfDetailUnclamped(g_sSamp, float3(0.4, 0.5, 0.6));
+   float txval42 = g_tTexcdu4a . CalculateLevelOfDetailUnclamped(g_sSamp, float3(0.7, 0.8, 0.9));
+
+   psout.Color = 1.0;
+   psout.Depth = 1.0;
+
+   return psout;
+}

Test/hlsl.getsampleposition.dx10.frag

+SamplerState       g_sSamp : register(s0);
+
+Texture2DMS      <float4>  g_tTex2dmsf4;
+Texture2DMSArray <float4>  g_tTex2dmsf4a;
+
+struct PS_OUTPUT
+{
+    float4 Color : SV_Target0;
+    float  Depth : SV_Depth;
+};
+
+PS_OUTPUT main()
+{
+   PS_OUTPUT psout;
+
+   float2 r00 = g_tTex2dmsf4.GetSamplePosition(1);
+   float2 r01 = g_tTex2dmsf4a.GetSamplePosition(2);
+
+   psout.Color = 1.0;
+   psout.Depth = 1.0;
+
+   return psout;
+}

gtests/Hlsl.FromFile.cpp

@@ -76,6 +76,8 @@ INSTANTIATE_TEST_CASE_P(
         {"hlsl.assoc.frag", "PixelShaderFunction"},
         {"hlsl.attribute.frag", "PixelShaderFunction"},
         {"hlsl.buffer.frag", "PixelShaderFunction"},
+        {"hlsl.calculatelod.dx10.frag", "main"},
+        {"hlsl.calculatelodunclamped.dx10.frag", "main"},
         {"hlsl.cast.frag", "PixelShaderFunction"},
         {"hlsl.conditional.frag", "PixelShaderFunction"},
         {"hlsl.discard.frag", "PixelShaderFunction"},
@@ -90,6 +92,7 @@ INSTANTIATE_TEST_CASE_P(
         {"hlsl.gather.offsetarray.dx10.frag", "main"},
         {"hlsl.getdimensions.dx10.frag", "main"},
         {"hlsl.getdimensions.dx10.vert", "main"},
+        {"hlsl.getsampleposition.dx10.frag", "main"},
         {"hlsl.if.frag", "PixelShaderFunction"},
         {"hlsl.inoutquals.frag", "main"},
         {"hlsl.init.frag", "ShaderFunction"},

hlsl/hlslParseHelper.cpp

@@ -1273,6 +1273,38 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
             break;
         }
         
+    case EOpMethodCalculateLevelOfDetail:
+    case EOpMethodCalculateLevelOfDetailUnclamped:
+        {
+            TIntermTyped* argTex    = argAggregate->getSequence()[0]->getAsTyped();
+            TIntermTyped* argSamp   = argAggregate->getSequence()[1]->getAsTyped();
+            TIntermTyped* argCoord  = argAggregate->getSequence()[2]->getAsTyped();
+
+            TIntermAggregate* txquerylod = new TIntermAggregate(EOpTextureQueryLod);
+
+            TIntermAggregate* txcombine = handleSamplerTextureCombine(loc, argTex, argSamp);
+            txquerylod->getSequence().push_back(txcombine);
+            txquerylod->getSequence().push_back(argCoord);
+
+            TIntermTyped* lodComponent = intermediate.addConstantUnion(0, loc, true);
+            TIntermTyped* lodComponentIdx = intermediate.addIndex(EOpIndexDirect, txquerylod, lodComponent, loc);
+            lodComponentIdx->setType(TType(EbtFloat, EvqTemporary, 1));
+
+            node = lodComponentIdx;
+
+            // We cannot currently obtain the unclamped LOD
+            if (op == EOpMethodCalculateLevelOfDetailUnclamped)
+                error(loc, "unimplemented: CalculateLevelOfDetailUnclamped", "", "");
+
+            break;
+        }
+
+    case EOpMethodGetSamplePosition:
+        {
+            error(loc, "unimplemented: GetSamplePosition", "", "");
+            break;
+        }
+
     default:
         break; // most pass through unchanged
     }

hlsl/hlslParseables.cpp

@@ -132,6 +132,12 @@ bool HasMipInCoord(const glslang::TString& name, bool isMS)
     return name == "Load" && !isMS;
 }
 
+// LOD calculations don't pass the array level in the coordinate.
+bool NoArrayCoord(const glslang::TString& name)
+{
+    return name == "CalculateLevelOfDetail" || name == "CalculateLevelOfDetailUnclamped";
+}
+
 // Handle IO params marked with > or <
 const char* IoParam(glslang::TString& s, const char* nthArgOrder)
 {
@@ -632,6 +638,11 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
         { "Gather",             /*!O*/        "V4",    nullptr,   "%@,S,V",         "FIU,S,F",       EShLangVSPSGS },
         { "Gather",             /* O*/        "V4",    nullptr,   "%@,S,V,V",       "FIU,S,F,I",     EShLangVSPSGS },
 
+        { "CalculateLevelOfDetail",           "S",     "F",       "%@,S,V",         "FUI,S,F",       EShLangFragmentMask },
+        { "CalculateLevelOfDetailUnclamped",  "S",     "F",       "%@,S,V",         "FUI,S,F",       EShLangFragmentMask },
+
+        { "GetSamplePosition",                "V2",    "F",       "$&2,S",          "FUI,I",         EShLangVSPSGS },
+
         // table of overloads from: https://msdn.microsoft.com/en-us/library/windows/desktop/bb509693(v=vs.85).aspx
         // 
         // UINT Width
@@ -770,8 +781,9 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
                                 // In case the repeated arg has its own I/O marker
                                 nthArgOrder = IoParam(s, nthArgOrder);
 
-                                // arrayed textures have one extra coordinate dimension
-                                if (isArrayed && arg == coordArg)
+                                // arrayed textures have one extra coordinate dimension, except for
+                                // the CalculateLevelOfDetail family.
+                                if (isArrayed && arg == coordArg && !NoArrayCoord(intrinsic.name))
                                     argDim0++;
 
                                 // Some texture methods use an addition arg dimension to hold mip
@@ -982,7 +994,10 @@ void TBuiltInParseablesHlsl::identifyBuiltIns(int /*version*/, EProfile /*profil
     symbolTable.relateToOperator("SampleLevel",                 EOpMethodSampleLevel);
     symbolTable.relateToOperator("Load",                        EOpMethodLoad);
     symbolTable.relateToOperator("GetDimensions",               EOpMethodGetDimensions);
+    symbolTable.relateToOperator("GetSamplePosition",           EOpMethodGetSamplePosition);
     symbolTable.relateToOperator("Gather",                      EOpMethodGather);
+    symbolTable.relateToOperator("CalculateLevelOfDetail",      EOpMethodCalculateLevelOfDetail);
+    symbolTable.relateToOperator("CalculateLevelOfDetailUnclamped", EOpMethodCalculateLevelOfDetailUnclamped);
 }
 
 //