Merge branch 'main' into ifdef

luciechoi · web-flow · commit 9ad31574fa45 · 2026-04-15T06:03:53.000+09:00
diff --git a/tools/clang/lib/Sema/SemaHLSL.cpp b/tools/clang/lib/Sema/SemaHLSL.cpp
@@ -11723,9 +11723,11 @@ void hlsl::DiagnoseRegisterType(clang::Sema *self, clang::SourceLocation loc,
     break;
 
   case AR_OBJECT_TEXTURE1D:
-  case AR_OBJECT_VK_SAMPLED_TEXTURE1D:
   case AR_OBJECT_TEXTURE1D_ARRAY:
+#ifdef ENABLE_SPIRV_CODEGEN
+  case AR_OBJECT_VK_SAMPLED_TEXTURE1D:
   case AR_OBJECT_VK_SAMPLED_TEXTURE1D_ARRAY:
+#endif
   case AR_OBJECT_TEXTURE2D:
   case AR_OBJECT_TEXTURE2D_ARRAY:
   case AR_OBJECT_TEXTURE3D:
