Skip to content

[SPIR-V] Fix OpSpecConstant for composite #8278

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
Keenuts merged 1 commit into from
Mar 24, 2026
Merged

[SPIR-V] Fix OpSpecConstant for composite #8278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion external/SPIRV-Headers
Open in desktop
Submodule SPIRV-Headers updated 12 files
+4 −2 include/spirv/spir-v.xml
+7 −0 include/spirv/unified1/spirv.bf
+70 −0 include/spirv/unified1/spirv.core.grammar.json
+7 −0 include/spirv/unified1/spirv.cs
+17 −0 include/spirv/unified1/spirv.h
+17 −0 include/spirv/unified1/spirv.hpp
+17 −0 include/spirv/unified1/spirv.hpp11
+9 −2 include/spirv/unified1/spirv.json
+7 −0 include/spirv/unified1/spirv.lua
+7 −0 include/spirv/unified1/spirv.py
+7 −0 include/spirv/unified1/spv.d
+1 −1 tools/buildHeaders/jsonToSpirv.h
2 changes: 1 addition & 1 deletion external/SPIRV-Tools
Open in desktop
Submodule SPIRV-Tools updated 113 files
5 changes: 4 additions & 1 deletion tools/clang/lib/SPIRV/SpirvEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8031,7 +8031,10 @@ SpirvInstruction *SpirvEmitter::createVectorSplat(const Expr *scalarExpr,
// Should find a more meaningful one.
if (auto *constVal = dyn_cast<SpirvConstant>(scalarVal)) {
llvm::SmallVector<SpirvConstant *, 4> elements(size_t(size), constVal);
const bool isSpecConst = constVal->getopcode() == spv::Op::OpSpecConstant;
const bool isSpecConst =
constVal->getopcode() == spv::Op::OpSpecConstant ||
constVal->getopcode() == spv::Op::OpSpecConstantFalse ||
constVal->getopcode() == spv::Op::OpSpecConstantTrue;
auto *value =
spvBuilder.getConstantComposite(vecType, elements, isSpecConst);
if (!value)
Expand Down
4 changes: 3 additions & 1 deletion tools/clang/test/CodeGenSPIRV/vk.spec-constant.reuse.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// RUN: %dxc -T ps_6_0 -HV 2018 -E main -fcgl %s -spirv | FileCheck %s

// CHECK: OpDecorate %y SpecId 0
// CHECK: %y = OpSpecConstantFalse %bool
[[vk::constant_id(0)]] const bool y = false;


[shader("pixel")]
float4 main(float4 position : SV_Position) : SV_Target0 {
// CHECK: OpConstantComposite %v4bool %y %y %y %y
// CHECK: OpSpecConstantComposite %v4bool %y %y %y %y
return y ? position : 1.0;
}
Loading