Skip to content

Add missing ENABLE_SPIRV_CODEGEN guards #8374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damyanp merged 2 commits into from
Apr 14, 2026
+6 −2
Merged

Add missing ENABLE_SPIRV_CODEGEN guards #8374

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc97523
Add missing ENABLE_SPIRV_CODEGEN guards for VK_SAMPLED_TEXTURE1D types
damyanp Apr 14, 2026
21dc2c9
Merge branch 'main' of https://github.com/microsoft/DirectXShaderComp…
damyanp Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tools/clang/lib/Sema/SemaHLSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Copy link
Copy Markdown
Contributor

@tex3d tex3d Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine, but in this case, there is a SPIRV block at the end of the empty fall-through case statements (L5061/R5063). It might be slightly cleaner to group these in that block.

case AR_OBJECT_VK_SAMPLED_TEXTURE1D_ARRAY:
#endif
case AR_OBJECT_TEXTURE2D:
case AR_OBJECT_TEXTURE2D_ARRAY:
case AR_OBJECT_TEXTURE3D:
Expand Down Expand Up @@ -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:
Expand Down
Loading