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/AstTypeProbe.cpp

@@ -934,7 +934,8 @@ bool isSampledTexture(QualType type) {
 
     if (name == "SampledTexture1D" || name == "SampledTexture1DArray" ||
         name == "SampledTexture2D" || name == "SampledTexture2DArray" ||
-        name == "SampledTexture2DMS" || name == "SampledTexture2DMSArray")
+        name == "SampledTexture2DMS" || name == "SampledTexture2DMSArray" ||
+        name == "SampledTexture3D")
       return true;
   }
   return false;

tools/clang/lib/SPIRV/LowerTypeVisitor.cpp

@@ -851,7 +851,8 @@ const SpirvType *LowerTypeVisitor::lowerVkTypeInVkNamespace(
   }
   if (name == "SampledTexture1D" || name == "SampledTexture1DArray" ||
       name == "SampledTexture2D" || name == "SampledTexture2DArray" ||
-      name == "SampledTexture2DMS" || name == "SampledTexture2DMSArray") {
+      name == "SampledTexture2DMS" || name == "SampledTexture2DMSArray" ||
+      name == "SampledTexture3D") {
     const auto sampledType = hlsl::GetHLSLResourceResultType(type);
     auto loweredType = lowerType(getElementType(astContext, sampledType), rule,
                                  /*isRowMajor*/ llvm::None, srcLoc);
@@ -863,7 +864,9 @@ const SpirvType *LowerTypeVisitor::lowerVkTypeInVkNamespace(
     }
 
     const spv::Dim dimension =
-        name.count("1D") > 0 ? spv::Dim::Dim1D : spv::Dim::Dim2D;
+        name.count("1D") > 0
+            ? spv::Dim::Dim1D
+            : (name.count("3D") > 0 ? spv::Dim::Dim3D : spv::Dim::Dim2D);
     const bool isArray = name.count("Array") > 0;
     const bool isMS = name.count("MS") > 0;
 

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -4409,6 +4409,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,6 +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_TEXTURE3D
 #endif            // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -1292,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.
@@ -1361,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(
@@ -1423,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
 
@@ -1541,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
 
@@ -1700,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
 
@@ -1875,6 +1882,7 @@ static const char *g_ArBasicTypeNames[] = {
     "SampledTexture2DArray",
     "SampledTexture2DMS",
     "SampledTexture2DMSArray",
+    "SampledTexture3D",
 #endif // ENABLE_SPIRV_CODEGEN
     // SPIRV change ends
 
@@ -2552,6 +2560,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;
@@ -4162,7 +4174,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 =
@@ -4998,6 +5011,7 @@ class HLSLExternalSource : public ExternalSemaSource {
     case AR_OBJECT_VK_SAMPLED_TEXTURE1D_ARRAY:
     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:
@@ -5148,6 +5162,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;
@@ -11709,6 +11726,7 @@ void hlsl::DiagnoseRegisterType(clang::Sema *self, clang::SourceLocation loc,
   case AR_OBJECT_VK_SAMPLED_TEXTURE1D_ARRAY:
   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/vk.sampledtexture.calculate-lod-unclamped.hlsl

@@ -10,11 +10,14 @@
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 // CHECK: [[type_2d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 0 1 Unknown
 // CHECK: [[type_2d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_array]]
+// CHECK: [[type_3d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 3D 0 0 0 1 Unknown
+// CHECK: [[type_3d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_3d_image]]
 
 vk::SampledTexture1D<float4> tex1d;
 vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 vk::SampledTexture2DArray<float4> tex2dArray;
+vk::SampledTexture3D<float4> tex3d;
 
 void main() {
   float2 xy = float2(0.5, 0.5);
@@ -40,4 +43,9 @@ void main() {
 // CHECK-NEXT: [[query1da:%[a-zA-Z0-9_]+]] = OpImageQueryLod %v2float [[tex1da_load]] %float_0_5
 // CHECK-NEXT:        {{%[0-9]+}} = OpCompositeExtract %float [[query1da]] 1
   float lod4 = tex1dArray.CalculateLevelOfDetailUnclamped(0.5);
+
+// CHECK:          [[tex3d_load:%[a-zA-Z0-9_]+]] = OpLoad [[type_3d_sampled_image]] %tex3d
+// CHECK-NEXT: [[query3d:%[a-zA-Z0-9_]+]] = OpImageQueryLod %v2float [[tex3d_load]] %{{[0-9]+}}
+// CHECK-NEXT:        {{%[0-9]+}} = OpCompositeExtract %float [[query3d]] 1
+  float lod5 = tex3d.CalculateLevelOfDetailUnclamped(float3(0.5, 0.25, 0));
 }

tools/clang/test/CodeGenSPIRV/vk.sampledtexture.calculate-lod.hlsl

@@ -10,11 +10,14 @@
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 // CHECK: [[type_2d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 0 1 Unknown
 // CHECK: [[type_2d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_array]]
+// CHECK: [[type_3d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 3D 0 0 0 1 Unknown
+// CHECK: [[type_3d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_3d_image]]
 
 vk::SampledTexture1D<float4> tex1d;
 vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 vk::SampledTexture2DArray<float4> tex2dArray;
+vk::SampledTexture3D<float4> tex3d;
 
 void main() {
   float2 xy = float2(0.5, 0.5);
@@ -40,4 +43,9 @@ void main() {
 // CHECK-NEXT: [[query1da:%[a-zA-Z0-9_]+]] = OpImageQueryLod %v2float [[tex1da_load]] %float_0_5
 // CHECK-NEXT:        {{%[0-9]+}} = OpCompositeExtract %float [[query1da]] 0
   float lod4 = tex1dArray.CalculateLevelOfDetail(0.5);
+
+// CHECK:          [[tex3d_load:%[a-zA-Z0-9_]+]] = OpLoad [[type_3d_sampled_image]] %tex3d
+// CHECK-NEXT: [[query3d:%[a-zA-Z0-9_]+]] = OpImageQueryLod %v2float [[tex3d_load]] %{{[0-9]+}}
+// CHECK-NEXT:        {{%[0-9]+}} = OpCompositeExtract %float [[query3d]] 0
+  float lod5 = tex3d.CalculateLevelOfDetail(float3(0.5, 0.25, 0));
 }

tools/clang/test/CodeGenSPIRV/vk.sampledtexture.get-dimensions.hlsl

@@ -11,6 +11,8 @@
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 // CHECK: [[type_2d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 0 1 Unknown
 // CHECK: [[type_2d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_array]]
+// CHECK: [[type_3d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 3D 0 0 0 1 Unknown
+// CHECK: [[type_3d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_3d_image]]
 // CHECK: [[type_2d_image_ms:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 0 1 1 Unknown
 // CHECK: [[type_2d_sampled_image_ms:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_ms]]
 // CHECK: [[type_2d_image_ms_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 1 1 Unknown
@@ -20,6 +22,7 @@ vk::SampledTexture1D<float4> tex1d;
 vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 vk::SampledTexture2DArray<float4> tex2dArray;
+vk::SampledTexture3D<float4> tex3d;
 vk::SampledTexture2DMS<float4> tex2dMS;
 vk::SampledTexture2DMSArray<float4> tex2dMSArray;
 
@@ -166,6 +169,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/vk.sampledtexture.load.hlsl

@@ -10,6 +10,8 @@
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 // CHECK: [[type_2d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 0 1 Unknown
 // CHECK: [[type_2d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_array]]
+// CHECK: [[type_3d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 3D 0 0 0 1 Unknown
+// CHECK: [[type_3d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_3d_image]]
 // CHECK: [[type_2d_image_ms:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 0 1 1 Unknown
 // CHECK: [[type_2d_sampled_image_ms:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_ms]]
 // CHECK: [[type_2d_image_ms_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 1 1 Unknown
@@ -19,6 +21,7 @@ vk::SampledTexture1D<float4> tex1d;
 vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 vk::SampledTexture2DArray<float4> tex2dArray;
+vk::SampledTexture3D<float4> tex3d;
 vk::SampledTexture2DMS<float4> tex2dMS;
 vk::SampledTexture2DMSArray<float4> tex2dMSArray;
 
@@ -101,5 +104,13 @@ float4 main(int3 location3: A, int4 location4: B) : SV_Target {
 // CHECK-NEXT: {{[%0-9]+}} = OpImageFetch %v4float [[tex_1d_arr_img]] [[coord_1]] Lod [[lod_0]]
     float4 val8 = tex1dArray.Load(location4.xyz);
 
+// CHECK:        [[loc3d:%[0-9]+]] = OpLoad %v4int %location4
+// CHECK-NEXT: [[coord3d:%[0-9]+]] = OpVectorShuffle %v3int [[loc3d]] [[loc3d]] 0 1 2
+// CHECK-NEXT:   [[lod3d:%[0-9]+]] = OpCompositeExtract %int [[loc3d]] 3
+// CHECK-NEXT: [[tex3d_load:%[0-9]+]] = OpLoad [[type_3d_sampled_image]] %tex3d
+// CHECK-NEXT:  [[img3d:%[0-9]+]] = OpImage [[type_3d_image]] [[tex3d_load]]
+// CHECK-NEXT:          {{%[0-9]+}} = OpImageFetch %v4float [[img3d]] [[coord3d]] Lod [[lod3d]]
+    float4 val9 = tex3d.Load(location4);
+
     return 1.0;
 }

tools/clang/test/CodeGenSPIRV/vk.sampledtexture.sample-bias.hlsl

@@ -6,6 +6,7 @@
 // CHECK: [[v2fc:%[0-9]+]] = OpConstantComposite %v2float %float_0_5 %float_0_25
 // CHECK: [[v2ic:%[0-9]+]] = OpConstantComposite %v2int %int_2 %int_3
 // CHECK: [[v3fc:%[0-9]+]] = OpConstantComposite %v3float %float_0_5 %float_0_25 %float_0
+// CHECK: [[v3ic:%[0-9]+]] = OpConstantComposite %v3int %int_1 %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]]
@@ -15,11 +16,14 @@
 // CHECK: [[type_2d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image]]
 // CHECK: [[type_2d_image_array:%[a-zA-Z0-9_]+]] = OpTypeImage %float 2D 0 1 0 1 Unknown
 // CHECK: [[type_2d_sampled_image_array:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_2d_image_array]]
+// CHECK: [[type_3d_image:%[a-zA-Z0-9_]+]] = OpTypeImage %float 3D 0 0 0 1 Unknown
+// CHECK: [[type_3d_sampled_image:%[a-zA-Z0-9_]+]] = OpTypeSampledImage [[type_3d_image]]
 
 vk::SampledTexture1D<float4> tex1d;
 vk::SampledTexture1DArray<float4> tex1dArray;
 vk::SampledTexture2D<float4> tex2d;
 vk::SampledTexture2DArray<float4> tex2dArray;
+vk::SampledTexture3D<float4> tex3d;
 
 float4 main() : SV_Target {
 // CHECK: [[tex1_load:%[a-zA-Z0-9_]+]] = OpLoad [[type_2d_sampled_image]] %tex2d
@@ -49,5 +53,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;
 }