From fc97523f6dbe62acb88fa1d446b54ef3594ecb6a Mon Sep 17 00:00:00 2001 From: Damyan Pepper Date: Tue, 14 Apr 2026 09:40:38 -0700 Subject: [PATCH] Add missing ENABLE_SPIRV_CODEGEN guards for VK_SAMPLED_TEXTURE1D types The SPIR-V SampledTexture1D commit (71bf9110c) added case labels for AR_OBJECT_VK_SAMPLED_TEXTURE1D and AR_OBJECT_VK_SAMPLED_TEXTURE1D_ARRAY in GetBasicKindType() and DiagnoseRegisterType() without wrapping them in #ifdef ENABLE_SPIRV_CODEGEN. This causes build failures when SPIRV codegen is disabled. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- tools/clang/lib/Sema/SemaHLSL.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/clang/lib/Sema/SemaHLSL.cpp b/tools/clang/lib/Sema/SemaHLSL.cpp index 8cf98ec991..2d3eb85a6a 100644 --- a/tools/clang/lib/Sema/SemaHLSL.cpp +++ b/tools/clang/lib/Sema/SemaHLSL.cpp @@ -4996,9 +4996,11 @@ class HLSLExternalSource : public ExternalSemaSource { case AR_OBJECT_LEGACY_EFFECT: // used for all legacy effect object types 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: @@ -11725,9 +11727,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: