SampledTexture3d

Author: luciechoi

include/dxc/dxcapi.internal.h

@@ -146,7 +146,8 @@ enum LEGAL_INTRINSIC_COMPTYPES {
   LICOMPTYPE_VK_SAMPLED_TEXTURE2D_ARRAY = 60,
   LICOMPTYPE_VK_SAMPLED_TEXTURE2DMS = 61,
   LICOMPTYPE_VK_SAMPLED_TEXTURE2DMS_ARRAY = 62,
-  LICOMPTYPE_COUNT = 63
+  LICOMPTYPE_VK_SAMPLED_TEXTURE3D = 63,
+  LICOMPTYPE_COUNT = 64
 #else
   LICOMPTYPE_COUNT = 56
 #endif

tools/clang/lib/SPIRV/LowerTypeVisitor.cpp

@@ -864,7 +864,9 @@ const SpirvType *LowerTypeVisitor::lowerVkTypeInVkNamespace(
     constexpr size_t sampledTexturePrefixLength = sizeof("SampledTexture") - 1;
     StringRef suffix = name.drop_front(sampledTexturePrefixLength);
     const spv::Dim dimension =
-        suffix.startswith("1D") ? spv::Dim::Dim1D : spv::Dim::Dim2D;
+        suffix.startswith("1D") ? spv::Dim::Dim1D : (suffix.startswith("2D")
+                                                       ? spv::Dim::Dim2D
+                                                       : spv::Dim::Dim3D);
     const bool isArray = suffix.endswith("Array");
     const bool isMS = suffix.find("MS") != StringRef::npos;
 

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -4417,6 +4417,7 @@ SpirvEmitter::processBufferTextureGetDimensions(const CXXMemberCallExpr *expr) {
       (typeName == "SampledTexture1DArray" && numArgs > 2) ||
       (typeName == "SampledTexture2D" && numArgs > 2) ||
       (typeName == "SampledTexture2DArray" && numArgs > 3) ||
+      (typeName == "SampledTexture3D" && numArgs > 3) ||
       (typeName == "TextureCube" && numArgs > 2) ||
       (typeName == "Texture3D" && numArgs > 3) ||
       (typeName == "Texture1DArray" && numArgs > 2) ||

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -206,6 +206,7 @@ enum ArBasicKind {
   AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY,
   AR_OBJECT_VK_SAMPLED_TEXTURE2DMS,
   AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY,
+  AR_OBJECT_VK_SAMPLED_TEXTURE3D,
 #endif // ENABLE_SPIRV_CODEGEN
   // SPIRV change ends
 
@@ -572,7 +573,7 @@ const UINT g_uBasicKindProps[] = {
     BPROP_OBJECT | BPROP_RBUFFER, // AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY
     BPROP_OBJECT | BPROP_RBUFFER, // AR_OBJECT_VK_SAMPLED_TEXTURE2DMS
     BPROP_OBJECT | BPROP_RBUFFER, // AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY
-    BPROP_OBJECT | BPROP_RBUFFER, // AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY
+    BPROP_OBJECT | BPROP_RBUFFER, // AR_OBJECT_VK_SAMPLED_TEXTURE3D
 #endif            // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -1293,6 +1294,8 @@ static const ArBasicKind g_VKSampledTexture2DMSCT[] = {
     AR_OBJECT_VK_SAMPLED_TEXTURE2DMS, AR_BASIC_UNKNOWN};
 static const ArBasicKind g_VKSampledTexture2DMSArrayCT[] = {
     AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY, AR_BASIC_UNKNOWN};
+static const ArBasicKind g_VKSampledTexture3DCT[] = {
+    AR_OBJECT_VK_SAMPLED_TEXTURE3D, AR_BASIC_UNKNOWN};
 #endif
 
 // Basic kinds, indexed by a LEGAL_INTRINSIC_COMPTYPES value.
@@ -1362,6 +1365,7 @@ const ArBasicKind *g_LegalIntrinsicCompTypes[] = {
     g_VKSampledTexture2DArrayCT,   // LICOMPTYPE_VK_SAMPLED_TEXTURE2D_ARRAY
     g_VKSampledTexture2DMSCT,      // LICOMPTYPE_VK_SAMPLED_TEXTURE2DMS
     g_VKSampledTexture2DMSArrayCT, // LICOMPTYPE_VK_SAMPLED_TEXTURE2DMS_ARRAY
+    g_VKSampledTexture3DCT,        // LICOMPTYPE_VK_SAMPLED_TEXTURE3D
 #endif
 };
 static_assert(
@@ -1424,7 +1428,7 @@ static const ArBasicKind g_ArBasicKindsAsTypes[] = {
     AR_OBJECT_VK_BUFFER_POINTER, AR_OBJECT_VK_SAMPLED_TEXTURE1D,
     AR_OBJECT_VK_SAMPLED_TEXTURE1D_ARRAY, AR_OBJECT_VK_SAMPLED_TEXTURE2D,
     AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY, AR_OBJECT_VK_SAMPLED_TEXTURE2DMS,
-    AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY,
+    AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY, AR_OBJECT_VK_SAMPLED_TEXTURE3D,
 #endif // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -1542,6 +1546,7 @@ static const uint8_t g_ArBasicKindsTemplateCount[] = {
     1, // AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY
     1, // AR_OBJECT_VK_SAMPLED_TEXTURE2DMS
     1, // AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY
+    1, // AR_OBJECT_VK_SAMPLED_TEXTURE3D
 #endif // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -1701,6 +1706,7 @@ static const SubscriptOperatorRecord g_ArBasicKindsSubscripts[] = {
     {3, MipsTrue, SampleFalse},  // AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY
     {2, MipsFalse, SampleTrue},  // AR_OBJECT_VK_SAMPLED_TEXTURE2DMS
     {3, MipsFalse, SampleTrue},  // AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY
+    {3, MipsTrue, SampleFalse},  // AR_OBJECT_VK_SAMPLED_TEXTURE3D
 #endif                           // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -1876,6 +1882,7 @@ static const char *g_ArBasicTypeNames[] = {
     "SampledTexture2DArray",
     "SampledTexture2DMS",
     "SampledTexture2DMSArray",
+    "SampledTexture3D",
 #endif // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -2556,6 +2563,10 @@ static void GetIntrinsicMethods(ArBasicKind kind,
     *intrinsics = g_VkSampledTexture2DMSArrayMethods;
     *intrinsicCount = _countof(g_VkSampledTexture2DMSArrayMethods);
     break;
+  case AR_OBJECT_VK_SAMPLED_TEXTURE3D:
+    *intrinsics = g_VkSampledTexture3DMethods;
+    *intrinsicCount = _countof(g_VkSampledTexture3DMethods);
+    break;
 #endif
   case AR_OBJECT_HIT_OBJECT:
     *intrinsics = g_DxHitObjectMethods;
@@ -4166,7 +4177,8 @@ class HLSLExternalSource : public ExternalSemaSource {
                  kind == AR_OBJECT_VK_SAMPLED_TEXTURE2D ||
                  kind == AR_OBJECT_VK_SAMPLED_TEXTURE2D_ARRAY ||
                  kind == AR_OBJECT_VK_SAMPLED_TEXTURE2DMS ||
-                 kind == AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY) {
+                 kind == AR_OBJECT_VK_SAMPLED_TEXTURE2DMS_ARRAY ||
+                 kind == AR_OBJECT_VK_SAMPLED_TEXTURE3D) {
         if (!m_vkNSDecl)
           continue;
         QualType float4Type =
@@ -5004,6 +5016,7 @@ class HLSLExternalSource : public ExternalSemaSource {
 #endif
     case AR_OBJECT_TEXTURE2D:
     case AR_OBJECT_TEXTURE2D_ARRAY:
+    case AR_OBJECT_VK_SAMPLED_TEXTURE3D:
     case AR_OBJECT_TEXTURE3D:
     case AR_OBJECT_TEXTURECUBE:
     case AR_OBJECT_TEXTURECUBE_ARRAY:
@@ -5154,6 +5167,9 @@ class HLSLExternalSource : public ExternalSemaSource {
       ResClass = DXIL::ResourceClass::UAV;
       return true;
     case AR_OBJECT_TEXTURE3D:
+#ifdef ENABLE_SPIRV_CODEGEN
+    case AR_OBJECT_VK_SAMPLED_TEXTURE3D:
+#endif
       ResKind = DXIL::ResourceKind::Texture3D;
       ResClass = DXIL::ResourceClass::SRV;
       return true;
@@ -11735,6 +11751,7 @@ void hlsl::DiagnoseRegisterType(clang::Sema *self, clang::SourceLocation loc,
 #endif
   case AR_OBJECT_TEXTURE2D:
   case AR_OBJECT_TEXTURE2D_ARRAY:
+  case AR_OBJECT_VK_SAMPLED_TEXTURE3D:
   case AR_OBJECT_TEXTURE3D:
   case AR_OBJECT_TEXTURECUBE:
   case AR_OBJECT_TEXTURECUBE_ARRAY:

tools/clang/test/CodeGenSPIRV/SampledTexture/SampledTexture2D/vk.sampledtexture2d.get-dimensions.hlsl

@@ -3,15 +3,9 @@
 
 // CHECK: OpCapability ImageQuery
 
-// CHECK: [[type_1d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 1D 0 0 0 1 Unknown
-// CHECK: [[type_1d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_1d_image]]
-// CHECK: [[type_1d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 1D 0 1 0 1 Unknown
-// CHECK: [[type_1d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_1d_image_array]]
 // CHECK: [[type_2d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 0 0 1 Unknown
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 
-vk::SampledTexture1D<float4> tex1d;
-vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 
 void main() {
@@ -108,6 +102,13 @@ void main() {
 // CHECK-NEXT:                      OpStore %i_numLevels [[query_level_2_int]]
   tex2d.GetDimensions(mipLevel, i_width, i_height, i_numLevels);
 
+// CHECK:           [[t3d_load:%[0-9]+]] = OpLoad [[type_3d_sampled_image]] %tex3d
+// CHECK-NEXT:      [[image3d:%[0-9]+]] = OpImage [[type_3d_image]] [[t3d_load]]
+// CHECK-NEXT:      [[query3d:%[0-9]+]] = OpImageQuerySizeLod %v3uint [[image3d]] %int_0
+// CHECK-NEXT:    [[query3d_0:%[0-9]+]] = OpCompositeExtract %uint [[query3d]] 0
+// CHECK-NEXT:                         OpStore %width [[query3d_0]]
+  tex3d.GetDimensions(width, height, elements);
+
 #ifdef ERROR
 // ERROR: error: Output argument must be an l-value
   tex2d.GetDimensions(mipLevel, 0, height, numLevels);

tools/clang/test/CodeGenSPIRV/SampledTexture/SampledTexture2D/vk.sampledtexture2d.sample-bias.hlsl

@@ -6,15 +6,9 @@
 // CHECK: [[v2fc:%[0-9]+]] = OpConstantComposite %v2float %float_0_5 %float_0_25
 // CHECK: [[v2ic:%[0-9]+]] = OpConstantComposite %v2int %int_2 %int_3
 
-// CHECK: [[type_1d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 1D 0 0 0 1 Unknown
-// CHECK: [[type_1d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_1d_image]]
-// CHECK: [[type_1d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 1D 0 1 0 1 Unknown
-// CHECK: [[type_1d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_1d_image_array]]
 // CHECK: [[type_2d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 0 0 1 Unknown
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 
-vk::SampledTexture1D<float4> tex1d;
-vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 
 float4 main() : SV_Target {
@@ -45,5 +39,9 @@ float4 main() : SV_Target {
 // CHECK: [[sampled_1da:%[a-zA-Z0-9_]+]] = OpImageSampleImplicitLod %v4float [[tex1da_load]] {{%[0-9]+}} Bias|ConstOffset %float_0_5 %int_1
     float4 val6 = tex1dArray.SampleBias(float2(0.5, 0), 0.5f, 1);
 
+// CHECK: [[tex3d_load:%[a-zA-Z0-9_]+]] = OpLoad [[type_3d_sampled_image]] %tex3d
+// CHECK: [[sampled_3d:%[a-zA-Z0-9_]+]] = OpImageSampleImplicitLod %v4float [[tex3d_load]] [[v3fc]] Bias|ConstOffset %float_0_5 [[v3ic]]
+    float4 val7 = tex3d.SampleBias(float3(0.5, 0.25, 0), 0.5f, int3(1, 2, 3));
+
     return 1.0;
 }

utils/hct/gen_intrin_main.txt

@@ -1512,4 +1512,33 @@ namespace VkSampledTexture2DMSArrayMethods {
     $classT [[]] Load(in int<3> x, in int s, in int<2> o, out uint_only status) : texture2darray_ms_o_s;
 } namespace
 
+namespace VkSampledTexture3DMethods {
+
+float [[ro]] CalculateLevelOfDetail(in float<3> x) : tex3d_t_calc_lod;
+float [[ro]] CalculateLevelOfDetailUnclamped(in float<3> x) : tex3d_t_calc_lod_unclamped;
+void [[]] GetDimensions(in uint x, out uint_only width, out $type2 height, out $type2 depth, out $type2 levels) : resinfo_uint;
+void [[]] GetDimensions(in uint x, out float_like width, out $type2 height, out $type2 depth, out $type2 levels) : resinfo;
+void [[]] GetDimensions(out uint_only width, out $type1 height, out $type1 depth) : resinfo_uint_o;
+void [[]] GetDimensions(out float_like width, out $type1 height, out $type1 depth) : resinfo_o;
+$classT [[ro]] Load(in int<4> x) : tex3d_t_load;
+$classT [[ro]] Load(in int<4> x, in int<3> o) : tex3d_t_load_o;
+$classT [[]] Load(in int<4> x, in int<3> o, out uint_only status) : tex3d_t_load_o_s;
+$classT [[ro]] Sample(in float<3> x) : tex3d_t;
+$classT [[ro]] Sample(in float<3> x, in int<3> o) : tex3d_t_o;
+$classT [[ro]] SampleBias(in float<3> x, in float bias) : tex3d_t_bias;
+$classT [[ro]] SampleBias(in float<3> x, in float bias, in int<3> o) : tex3d_t_bias_o;
+$classT [[ro]] SampleGrad(in float<3> x, in $type1 ddx, in $type1 ddy) : tex3d_t_dd;
+$classT [[ro]] SampleGrad(in float<3> x, in $type1 ddx, in $type1 ddy, in int<3> o) : tex3d_t_dd_o;
+$classT [[ro]] SampleLevel(in float<3> x, in float lod) : tex3d_t_lod;
+$classT [[ro]] SampleLevel(in float<3> x, in float lod, in int<3> o) : tex3d_t_lod_o;
+$classT [[ro]] Sample(in float<3> x, in int<3> o, in float clamp) : tex3d_t_o_cl;
+$classT [[]] Sample(in float<3> x, in int<3> o, in float clamp, out uint_only status) : tex3d_t_o_cl_s;
+$classT [[]] SampleLevel(in float<3> x, in float lod, in int<3> o, out uint_only status) : tex3d_t_lod_o_s;
+$classT [[ro]] SampleBias(in float<3> x, in float bias, in int<3> o, in float clamp) : tex3d_t_bias_o_cl;
+$classT [[]] SampleBias(in float<3> x, in float bias, in int<3> o, in float clamp, out uint_only status) : tex3d_t_bias_o_cl_s;
+$classT [[]] SampleGrad(in float<3> x, in $type1 ddx, in $type1 ddy, in int<3> o, in float clamp) : tex3d_t_dd_o_cl;
+$classT [[]] SampleGrad(in float<3> x, in $type1 ddx, in $type1 ddy, in int<3> o, in float clamp, out uint_only status) : tex3d_t_dd_o_cl_s;
+} namespace
+
+
 // SPIRV Change Ends