Skip to content

local_size_*_id and SPIR-V 1.2 #4052

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

Open
pobrn wants to merge 4 commits into
base: main
Choose a base branch
from
+26 −16
Open

local_size_*_id and SPIR-V 1.2 #4052

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0059e5e
Reject `local_size_*_id` before SPIR-V 1.2
pobrn Sep 30, 2025
c42661b
spirv: only set LocalSizeId mode when necessary
pobrn Sep 30, 2025
f50e9a6
spirv: use `LocalSizeId` exec mode when targeting >= SPIR-V 1.2
pobrn Sep 30, 2025
f604525
spirv: remove unnecessary assignment
pobrn Sep 30, 2025
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
4 changes: 2 additions & 2 deletions SPIRV/GlslangToSpv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,7 +1836,7 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
break;
}
}
if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_6 && needSizeId) {
if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_2 && needSizeId) {
Copy link
Copy Markdown
Collaborator

@dnovillo dnovillo Oct 6, 2025

Choose a reason for hiding this comment

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

Could you please add a test for this? The one in #3510 seems fine. Also, please split it into its own PR for clarity.

Copy link
Copy Markdown
Author

@pobrn pobrn Oct 7, 2025

Choose a reason for hiding this comment

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

I suppose I should add it to Spv.FromFile.cpp? And I imagine I can just add two new test suites CompileToSpirv11Test and CompileToSpirv12Test, and then use the same input file for both?

std::vector<spv::Id> dimConstId;
for (int dim = 0; dim < 3; ++dim) {
bool specConst = (glslangIntermediate->getLocalSizeSpecId(dim) != glslang::TQualifier::layoutNotSet);
Expand Down Expand Up @@ -1999,7 +1999,7 @@ TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion,
break;
}
}
if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_6 && needSizeId) {
if (glslangIntermediate->getSpv().spv >= glslang::EShTargetSpv_1_2 && needSizeId) {
std::vector<spv::Id> dimConstId;
for (int dim = 0; dim < 3; ++dim) {
bool specConst = (glslangIntermediate->getLocalSizeSpecId(dim) != glslang::TQualifier::layoutNotSet);
Expand Down