address comments

Author: luciechoi

tools/clang/lib/SPIRV/LowerTypeVisitor.cpp

@@ -861,8 +861,8 @@ const SpirvType *LowerTypeVisitor::lowerVkTypeInVkNamespace(
       loweredType = spvContext.getUIntType(32);
     }
 
-    // Drop the "SampledTexture" prefix.
-    StringRef suffix = name.drop_front(14);
+    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;
     const bool isArray = suffix.endswith("Array");

tools/clang/test/CodeGenSPIRV/SampledTexture/SampledTexture1D/vk.sampledtexture1d.access.hlsl

@@ -1,10 +1,13 @@
 // RUN: %dxc -T ps_6_7 -E main -fcgl  %s -spirv | FileCheck %s
+// RUN: not %dxc -T ps_6_7 -E main -fcgl  %s -spirv -DERROR 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
 
 // CHECK: %type_1d_image = OpTypeImage %float 1D 0 0 0 1 Unknown
 // CHECK: %type_sampled_image = OpTypeSampledImage %type_1d_image
 
 vk::SampledTexture1D<float4> tex1d;
 
+struct S { int a; };
+
 void main() {
 // CHECK: OpStore %pos1 %uint_1
   uint pos1 = 1;
@@ -16,4 +19,20 @@ void main() {
 // CHECK: OpStore %a1 [[fetch_result]]
   float4 a1 = tex1d[pos1];
 
+#ifdef ERROR
+  S s = { 1 };
+// CHECK-ERROR: error: no viable overloaded operator[]
+// CHECK-ERROR: note: candidate function {{.*}} no known conversion from 'S' to 'unsigned int' for 1st argument
+  float4 val2 = tex1d[s];
+
+  int2 i2 = int2(1, 2);
+// CHECK-ERROR: error: no viable overloaded operator[]
+// CHECK-ERROR: note: candidate function {{.*}} no known conversion from '{{int2|vector<int, 2>}}' to 'unsigned int' for 1st argument
+  float4 val3 = tex1d[i2];
+
+  int3 i3 = int3(1, 2, 3);
+// CHECK-ERROR: error: no viable overloaded operator[]
+// CHECK-ERROR: note: candidate function {{.*}} no known conversion from '{{int3|vector<int, 3>}}' to 'unsigned int' for 1st argument
+  float4 val4 = tex1d[i3];
+#endif
 }

tools/clang/test/CodeGenSPIRV/SampledTexture/SampledTexture1DArray/vk.sampledtexture1darray.access.hlsl

@@ -1,10 +1,13 @@
 // RUN: %dxc -T ps_6_7 -E main -fcgl  %s -spirv | FileCheck %s
+// RUN: not %dxc -T ps_6_7 -E main -fcgl  %s -spirv -DERROR 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
 
 // CHECK: %type_1d_image_array = OpTypeImage %float 1D 0 1 0 1 Unknown
 // CHECK: %type_sampled_image = OpTypeSampledImage %type_1d_image_array
 
 vk::SampledTexture1DArray<float4> tex1dArray;
 
+struct S { int a; };
+
 void main() {
 // CHECK: OpStore %pos1 [[pos1_init:%[a-zA-Z0-9_]+]]
 
@@ -17,4 +20,20 @@ void main() {
 
   float4 a1 = tex1dArray[pos1];
 
+#ifdef ERROR
+  S s = { 1 };
+// CHECK-ERROR: error: no viable overloaded operator[]
+// CHECK-ERROR: note: candidate function {{.*}} no known conversion from 'S' to 'vector<uint, 2>' for 1st argument
+  float4 val2 = tex1dArray[s];
+
+  uint pos2 = 2;
+// CHECK-ERROR: error: no viable overloaded operator[]
+// CHECK-ERROR: note: candidate function {{.*}} no known conversion from '{{uint|unsigned int}}' to 'vector<uint, 2>' for 1st argument
+  float4 val3 = tex1dArray[pos2];
+
+  int3 i3 = int3(1, 2, 3);
+// CHECK-ERROR: error: no viable overloaded operator[]
+// CHECK-ERROR: note: candidate function {{.*}} no known conversion from '{{int3|vector<int, 3>}}' to 'vector<uint, 2>' for 1st argument
+  float4 val4 = tex1dArray[i3];
+#endif
 }