HLSL: add 2DMS texture formats, and matching Load / GetDimensions support

Test/hlsl.getdimensions.dx10.frag

@@ -28,6 +28,14 @@ TextureCubeArray <float4> g_tTexcdf4a;
 TextureCubeArray <int4>   g_tTexcdi4a;
 TextureCubeArray <uint4>  g_tTexcdu4a;
 
+Texture2DMS <float4> g_tTex2dmsf4;
+Texture2DMS <int4>   g_tTex2dmsi4;
+Texture2DMS <uint4>  g_tTex2dmsu4;
+
+Texture2DMSArray <float4> g_tTex2dmsf4a;
+Texture2DMSArray <int4>   g_tTex2dmsi4a;
+Texture2DMSArray <uint4>  g_tTex2dmsu4a;
+
 struct PS_OUTPUT
 {
     float4 Color : SV_Target0;
@@ -137,6 +145,23 @@ PS_OUTPUT main()
    g_tTexcdu4a . GetDimensions(WidthU, HeightU, ElementsU);
    g_tTexcdu4a . GetDimensions(6, WidthU, HeightU, ElementsU, NumberOfLevelsU);
 
+   // 2DMS, float tx, uint params
+   g_tTex2dmsf4 . GetDimensions(WidthU, HeightU, NumberOfSamplesU);
+
+   // 2DMS, int tx, uint params
+   g_tTex2dmsi4 . GetDimensions(WidthU, HeightU, NumberOfSamplesU);
+
+   // 2DMS, uint tx, uint params
+   g_tTex2dmsu4 . GetDimensions(WidthU, HeightU, NumberOfSamplesU);
+
+   // 2DMSArray, float tx, uint params
+   g_tTex2dmsf4a . GetDimensions(WidthU, HeightU, ElementsU, NumberOfSamplesU);
+
+   // 2DMSArray, int tx, uint params
+   g_tTex2dmsi4a . GetDimensions(WidthU, HeightU, ElementsU, NumberOfSamplesU);
+
+   // 2DMSArray, uint tx, uint params
+   g_tTex2dmsu4a . GetDimensions(WidthU, HeightU, ElementsU, NumberOfSamplesU);
 
    // TODO: ***************************************************
    // Change this to 1 to enable float overloads when the HLSL
@@ -228,6 +253,24 @@ PS_OUTPUT main()
    // Cubearray, uint, float params
    g_tTexcdu4a . GetDimensions(WidthF, HeightF, ElementsF);
    g_tTexcdu4a . GetDimensions(6, WidthF, HeightF, ElementsF, NumberOfLevelsF);
+
+   // 2DMS, float tx, uint params
+   g_tTex2dmsf4 . GetDimensions(WidthF, HeightF, NumberOfSamplesF);
+
+   // 2DMS, int tx, uint params
+   g_tTex2dmsi4 . GetDimensions(WidthF, HeightF, NumberOfSamplesF);
+
+   // 2DMS, uint tx, uint params
+   g_tTex2dmsu4 . GetDimensions(WidthF, HeightF, NumberOfSamplesF);
+
+   // 2DMSArray, float tx, uint params
+   g_tTex2dmsf4a . GetDimensions(WidthF, HeightF, ElementsF, NumberOfSamplesF);
+
+   // 2DMSArray, int tx, uint params
+   g_tTex2dmsi4a . GetDimensions(WidthF, HeightF, ElementsF, NumberOfSamplesF);
+
+   // 2DMSArray, uint tx, uint params
+   g_tTex2dmsu4a . GetDimensions(WidthF, HeightF, ElementsF, NumberOfSamplesF);
 #endif // OVERLOAD_FIX
 
    psout.Color = 1.0;

Test/hlsl.load.2dms.dx10.frag

+SamplerState       g_sSamp : register(s0);
+
+Texture2DMS <float4> g_tTex2dmsf4;
+Texture2DMS <int4>   g_tTex2dmsi4;
+Texture2DMS <uint4>  g_tTex2dmsu4;
+
+Texture2DMSArray <float4> g_tTex2dmsf4a;
+Texture2DMSArray <int4>   g_tTex2dmsi4a;
+Texture2DMSArray <uint4>  g_tTex2dmsu4a;
+
+struct PS_OUTPUT
+{
+    float4 Color : SV_Target0;
+    float  Depth : SV_Depth;
+};
+
+uniform int   c1;
+uniform int2  c2;
+uniform int3  c3;
+uniform int4  c4;
+
+uniform int   o1;
+uniform int2  o2;
+uniform int3  o3;
+uniform int4  o4;
+
+PS_OUTPUT main()
+{
+   PS_OUTPUT psout;
+
+   // 2DMS, no offset
+   g_tTex2dmsf4.Load(c2, 3);
+   g_tTex2dmsi4.Load(c2, 3);
+   g_tTex2dmsu4.Load(c2, 3);
+
+   // 2DMS, offset
+   g_tTex2dmsf4.Load(c2, 3, o2);
+   g_tTex2dmsi4.Load(c2, 3, o2);
+   g_tTex2dmsu4.Load(c2, 3, o2);
+
+   // 2DMSArray, no offset
+   g_tTex2dmsf4a.Load(c3, 3);
+   g_tTex2dmsi4a.Load(c3, 3);
+   g_tTex2dmsu4a.Load(c3, 3);
+
+   // 2DMSArray, offset
+   g_tTex2dmsf4a.Load(c3, 3, o2);
+   g_tTex2dmsi4a.Load(c3, 3, o2);
+   g_tTex2dmsu4a.Load(c3, 3, o2);
+
+   psout.Color = 1.0;
+   psout.Depth = 1.0;
+
+   return psout;
+}
+

Test/hlsl.load.basic.dx10.vert

+SamplerState       g_sSamp : register(s0);
+
+uniform Texture1D <float4> g_tTex1df4 : register(t0);
+Texture1D <int4>   g_tTex1di4;
+Texture1D <uint4>  g_tTex1du4;
+
+Texture2D <float4> g_tTex2df4;
+Texture2D <int4>   g_tTex2di4;
+Texture2D <uint4>  g_tTex2du4;
+
+Texture3D <float4> g_tTex3df4;
+Texture3D <int4>   g_tTex3di4;
+Texture3D <uint4>  g_tTex3du4;
+
+TextureCube <float4> g_tTexcdf4;
+TextureCube <int4>   g_tTexcdi4;
+TextureCube <uint4>  g_tTexcdu4;
+
+Texture1DArray <float4> g_tTex1df4a;
+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 VS_OUTPUT
+{
+    float4 Pos : SV_Position;
+};
+
+uniform int   c1;
+uniform int2  c2;
+uniform int3  c3;
+uniform int4  c4;
+
+uniform int   o1;
+uniform int2  o2;
+uniform int3  o3;
+uniform int4  o4;
+
+VS_OUTPUT main()
+{
+   VS_OUTPUT vsout;
+
+   // 1D
+   g_tTex1df4.Load(c2);
+   g_tTex1di4.Load(c2);
+   g_tTex1du4.Load(c2);
+
+   // 2D
+   g_tTex2df4.Load(c3);
+   g_tTex2di4.Load(c3);
+   g_tTex2du4.Load(c3);
+
+   // 3D
+   g_tTex3df4.Load(c4);
+   g_tTex3di4.Load(c4);
+   g_tTex3du4.Load(c4);
+
+   // Offset has no Cube or CubeArray forms
+
+   vsout.Pos = float4(0,0,0,0);
+
+   return vsout;
+}

gtests/Hlsl.FromFile.cpp

@@ -102,8 +102,10 @@ INSTANTIATE_TEST_CASE_P(
         {"hlsl.intrinsics.negative.comp", "ComputeShaderFunction"},
         {"hlsl.intrinsics.negative.frag", "PixelShaderFunction"},
         {"hlsl.intrinsics.negative.vert", "VertexShaderFunction"},
+        {"hlsl.load.2dms.dx10.frag", "main"},
         {"hlsl.load.array.dx10.frag", "main"},
         {"hlsl.load.basic.dx10.frag", "main"},
+        {"hlsl.load.basic.dx10.vert", "main"},
         {"hlsl.load.offset.dx10.frag", "main"},
         {"hlsl.load.offsetarray.dx10.frag", "main"},
         {"hlsl.pp.line.frag", "main"},

hlsl/hlslParseHelper.cpp

@@ -1007,7 +1007,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
                 ++numDims;
 
             // Establish whether we're querying mip levels
-            const bool mipQuery = numArgs > (numDims + 1);
+            const bool mipQuery = (numArgs > (numDims + 1)) && (!texSampler.isMultiSample());
 
             // AST assumes integer return.  Will be converted to float if required.
             TIntermAggregate* sizeQuery = new TIntermAggregate(EOpTextureQuerySize);
@@ -1063,6 +1063,19 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
                 compoundStatement = intermediate.growAggregate(compoundStatement, compAssign);
             }
 
+            // 2DMS formats query # samples, which needs a different query op
+            if (texSampler.isMultiSample()) {
+                TIntermTyped* outParam = argAggregate->getSequence()[outParamBase + numDims]->getAsTyped();
+
+                TIntermAggregate* samplesQuery = new TIntermAggregate(EOpImageQuerySamples);
+                samplesQuery->getSequence().push_back(argTex);
+                samplesQuery->setType(TType(EbtUint, EvqTemporary, 1));
+                samplesQuery->setLoc(loc);
+                
+                TIntermTyped* compAssign = intermediate.addAssign(EOpAssign, outParam, samplesQuery, loc);
+                compoundStatement = intermediate.growAggregate(compoundStatement, compAssign);
+            }
+
             compoundStatement->setOperator(EOpSequence);
             compoundStatement->setLoc(loc);
             compoundStatement->setType(TType(EbtVoid));
@@ -1146,7 +1159,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
             // Last component of coordinate is the mip level, for non-MS.  we separate them here:
             if (isMS) {
                 // MS has no LOD
-                coordSwizzle = argTex;
+                coordSwizzle = argCoord;
             } else {
                 // Extract coordinate
                 TVectorFields coordFields(0,1,2,3);
@@ -1164,12 +1177,6 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
             const int numArgs    = argAggregate->getSequence().size();
             const bool hasOffset = ((!isMS && numArgs == 3) || (isMS && numArgs == 4));
 
-            // Obtain offset arg, if there is one.
-            if (hasOffset) {
-                const int offsetPos  = (isMS ? 3 : 2);
-                argOffset = argAggregate->getSequence()[offsetPos]->getAsTyped();
-            }
-
             // Create texel fetch
             const TOperator fetchOp = (hasOffset ? EOpTextureFetchOffset : EOpTextureFetch);
             TIntermAggregate* txfetch = new TIntermAggregate(fetchOp);
@@ -1177,18 +1184,26 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
             const TSamplerDim dim = argTex->getType().getSampler().dim;
             if (dim == EsdBuffer) // TODO: buffers
                 assert(0);
-            if (isMS) // TODO: 2DMS sample number
-                assert(0);
 
             // Build up the fetch
             txfetch->getSequence().push_back(argTex);
             txfetch->getSequence().push_back(coordSwizzle);
 
-            if (!isMS) // MS has no LOD
+            if (isMS) {
+                // add 2DMS sample index
+                TIntermTyped* argSampleIdx  = argAggregate->getSequence()[2]->getAsTyped();
+                txfetch->getSequence().push_back(argSampleIdx);
+            } else {
+                // 2DMS has no LOD, but everything else does.
                 txfetch->getSequence().push_back(lodComponent);
+            }
 
-            if (hasOffset)
+            // Obtain offset arg, if there is one.
+            if (hasOffset) {
+                const int offsetPos  = (isMS ? 3 : 2);
+                argOffset = argAggregate->getSequence()[offsetPos]->getAsTyped();
                 txfetch->getSequence().push_back(argOffset);
+            }
 
             txfetch->setType(node->getType());
             txfetch->setLoc(loc);

hlsl/hlslParseables.cpp

@@ -67,17 +67,17 @@ const char* BaseTypeName(const char argOrder, const char* scalarName, const char
     }
 }
 
-bool IsTextureType(const char argOrder)    { return argOrder == '%' || argOrder == '@'; }
 bool IsSamplerType(const char argType)     { return argType == 'S' || argType == 's'; }
-bool IsTextureArrayed(const char argOrder) { return argOrder == '@'; }
-// bool IsTextureMS(const char /*argOrder*/)  { return false; } // TODO: ...
+bool IsTextureArrayed(const char argOrder) { return argOrder == '@' || argOrder == '&'; }
+bool IsTextureMS(const char argOrder)      { return argOrder == '$' || argOrder == '&'; }
+bool IsTextureType(const char argOrder)    { return argOrder == '%' || argOrder == '@' || IsTextureMS(argOrder); }
 
 // Reject certain combinations that are illegal sample methods.  For example,
 // 3D arrays.
 bool IsIllegalSample(const glslang::TString& name, const char* argOrder, int dim0)
 {
     const bool isArrayed = IsTextureArrayed(*argOrder);
-    // const bool isMS      = IsTextureMS(*argOrder);
+    const bool isMS      = IsTextureMS(*argOrder);
 
     // there are no 3D arrayed textures, or 3D SampleCmp(LevelZero)
     if (dim0 == 3 && (isArrayed || name == "SampleCmp" || name == "SampleCmpLevelZero"))
@@ -108,6 +108,10 @@ bool IsIllegalSample(const glslang::TString& name, const char* argOrder, int dim
     if (name == "Load" && dim0 == 4)
         return true; // Load does not support any cubemaps, arrayed or not.
 
+    // Multisample formats are only 2D and 2Darray
+    if (isMS && dim0 != 2)
+        return true;
+
     return false;
 }
 
@@ -123,9 +127,9 @@ int CoordinateArgPos(const glslang::TString& name, bool isTexture)
 }
 
 // Some texture methods use an addition coordinate dimension for the mip
-bool HasMipInCoord(const glslang::TString& name)
+bool HasMipInCoord(const glslang::TString& name, bool isMS)
 {
-    return name == "Load";
+    return name == "Load" && !isMS;
 }
 
 // Handle IO params marked with > or <
@@ -151,6 +155,27 @@ void HandleRepeatArg(const char*& arg, const char*& prev, const char* current)
         prev = current;
 }
 
+// Return true for the end of a single argument key, which can be the end of the string, or
+// the comma separator.
+inline bool IsEndOfArg(const char* arg)
+{
+    return arg == nullptr || *arg == '\0' || *arg == ',';
+}
+
+
+// If this is a fixed vector size, such as V3, return the size.  Else return 0.
+int FixedVecSize(const char* arg) 
+{
+    while (!IsEndOfArg(arg)) {
+        if (isdigit(*arg))
+            return *arg - '0';
+        ++arg;
+    }
+
+    return 0; // none found.
+}
+
+
 // Create and return a type name.  This is done in GLSL, not HLSL conventions, until such
 // time as builtins are parsed using the HLSL parser.
 //
@@ -165,7 +190,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
     const bool isTexture   = IsTextureType(argOrder[0]);
     const bool isArrayed   = IsTextureArrayed(argOrder[0]);
     const bool isSampler   = IsSamplerType(argType[0]);
-    //const bool isMS        = IsTextureMS(argOrder[0]);
+    const bool isMS        = IsTextureMS(argOrder[0]);
 
     char type  = *argType;
 
@@ -182,7 +207,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
             type = 'u';
     }
 
-    while (!isalpha(*argOrder))
+    if (isTranspose || isMatMul)
         ++argOrder;
 
     char order = *argOrder;
@@ -226,7 +251,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
     }
 
     // handle fixed vector sizes, such as float3, and only ever 3.
-    const int fixedVecSize = isdigit(argOrder[1]) ? (argOrder[1] - '0') : 0;
+    const int fixedVecSize = FixedVecSize(argOrder);
     if (fixedVecSize != 0)
         dim0 = dim1 = fixedVecSize;
 
@@ -234,11 +259,11 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
     if (isSampler || isTexture) {
         if (order == 'V' || isTexture) {
             switch (dim0) {
-            case 1: s += "1D";   break;
-            case 2: s += "2D";   break;
-            case 3: s += "3D";   break;
-            case 4: s += "Cube"; break;
-            default: s += "UNKNOWN_SAMPLER"; break;
+            case 1: s += "1D";                   break;
+            case 2: s += (isMS ? "2DMS" : "2D"); break;
+            case 3: s += "3D";                   break;
+            case 4: s += "Cube";                 break;
+            default: s += "UNKNOWN_SAMPLER";     break;
             }
         }
     } else {
@@ -263,6 +288,8 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
                 s += ('0' + char(dim1));
                 break;
             }
+        default:
+            break;
         }
     }
 
@@ -305,14 +332,6 @@ inline bool IsValidGlsl(const char* cname, char retOrder, char retType, char arg
 }
 
 
-// Return true for the end of a single argument key, which can be the end of the string, or
-// the comma separator.
-inline bool IsEndOfArg(const char* arg)
-{
-    return arg == nullptr || *arg == '\0' || *arg == ',';
-}
-
-
 // return position of end of argument specifier
 inline const char* FindEndOfArg(const char* arg)
 {
@@ -322,19 +341,6 @@ inline const char* FindEndOfArg(const char* arg)
     return *arg == '\0' ? nullptr : arg;
 }
 
-// If this is a fixed vector size, such as V3, return the size.  Else return 0.
-int FixedVecSize(const char* arg) 
-{
-    while (!IsEndOfArg(arg)) {
-        if (isdigit(*arg))
-            return *arg - '0';
-        ++arg;
-    }
-
-    return 0; // none found.
-}
-
-
 // Return pointer to beginning of Nth argument specifier in the string.
 inline const char* NthArg(const char* arg, int n)
 {
@@ -429,6 +435,7 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
     // '#' as first letter of order sets rows=cols for mats
     // '%' as first letter of order creates texture of given F/I/U type (texture, itexture, etc)
     // '@' as first letter of order creates arrayed texture of given type
+    // '$' / '&' as first letter of order creates 2DMS / 2DMSArray textures
 
     static const struct {
         const char*   name;      // intrinsic name
@@ -619,9 +626,8 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
 
         { "Load",               /*!O*/        "V4",    nullptr,   "%@,V",           "FIU,I",         EShLangAll },
         { "Load",               /* O*/        "V4",    nullptr,   "%@,V,V",         "FIU,I,I",       EShLangAll },
-        // TODO: MS variants of Load
-        // { "Load", /* +sampleidex*/            "V4",    nullptr,   "$V,V,S",          "FIU,I,I",   EShLangAll },
-        // { "Load", /* +samplindex, offset*/    "V4",    nullptr,   "$V,V,S,V",        "FIU,I,I,I", EShLangAll },
+        { "Load", /* +sampleidex*/            "V4",    nullptr,   "$&,V,S",         "FIU,I,I",       EShLangAll },
+        { "Load", /* +samplindex, offset*/    "V4",    nullptr,   "$&,V,S,V",       "FIU,I,I,I",     EShLangAll },
 
         { "Gather",             /*!O*/        "V4",    nullptr,   "%@,S,V",         "FIU,S,F",       EShLangVSPSGS },
         { "Gather",             /* O*/        "V4",    nullptr,   "%@,S,V,V",       "FIU,S,F,I",     EShLangVSPSGS },
@@ -677,9 +683,12 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
         { "GetDimensions",   /* CubeArray */  "-",     "-",       "@4,S,>S,,,",     "FUI,U,,,,",     EShLangAll },
         { "GetDimensions",   /* CubeArray */  "-",     "-",       "@4,S,>S,,,",     "FUI,U,F,,,",    EShLangAll },
 
-        // TODO: GetDimensions for Texture2DMS, Texture2DMSArray
         // UINT Width, UINT Height, UINT Samples
         // UINT Width, UINT Height, UINT Elements, UINT Samples
+        { "GetDimensions",   /* 2DMS */       "-",     "-",       "$2,>S,,",        "FUI,U,,",        EShLangAll },
+        { "GetDimensions",   /* 2DMS */       "-",     "-",       "$2,>S,,",        "FUI,U,,",        EShLangAll },
+        { "GetDimensions",   /* 2DMSArray */  "-",     "-",       "&2,>S,,,",       "FUI,U,,,",       EShLangAll },
+        { "GetDimensions",   /* 2DMSArray */  "-",     "-",       "&2,>S,,,",       "FUI,U,,,",       EShLangAll },
 
         // Mark end of list, since we want to avoid a range-based for, as some compilers don't handle it yet.
         { nullptr,                            nullptr, nullptr,   nullptr,      nullptr,  0 },
@@ -703,7 +712,8 @@ void TBuiltInParseablesHlsl::initialize(int /*version*/, EProfile /*profile*/, c
             for (const char* argOrder = intrinsic.argOrder; !IsEndOfArg(argOrder); ++argOrder) { // for each order...
                 const bool isTexture   = IsTextureType(*argOrder);
                 const bool isArrayed   = IsTextureArrayed(*argOrder);
-                const bool mipInCoord  = HasMipInCoord(intrinsic.name);
+                const bool isMS        = IsTextureMS(*argOrder);
+                const bool mipInCoord  = HasMipInCoord(intrinsic.name, isMS);
                 const int fixedVecSize = FixedVecSize(argOrder);
                 const int coordArg     = CoordinateArgPos(intrinsic.name, isTexture);