Skip to content

Commit 7a0be57

Browse files
committed
Fix build issues.
1 parent 4d84546 commit 7a0be57

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

llvm/lib/Target/SPIRV/SPIRVCallLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ bool SPIRVCallLowering::lowerFormalArguments(MachineIRBuilder &MIRBuilder,
342342
buildOpDecorate(VRegs[i][0], MIRBuilder,
343343
SPIRV::Decoration::MaxByteOffset, {DerefBytes});
344344
}
345-
if (Arg.hasAttribute(Attribute::Alignment) && !ST->isVulkanEnv()) {
345+
if (Arg.hasAttribute(Attribute::Alignment) && !ST->isShaderEnv()) {
346346
auto Alignment = static_cast<unsigned>(
347347
Arg.getAttribute(Attribute::Alignment).getValueAsInt());
348348
buildOpDecorate(VRegs[i][0], MIRBuilder, SPIRV::Decoration::Alignment,

llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ Register SPIRVGlobalRegistry::buildGlobalVariable(
770770
if (IsConst && !ST.isShaderEnv())
771771
buildOpDecorate(Reg, MIRBuilder, SPIRV::Decoration::Constant, {});
772772

773-
if (GVar && GVar->getAlign().valueOrOne().value() != 1 && !ST.isVulkanEnv()) {
773+
if (GVar && GVar->getAlign().valueOrOne().value() != 1 && !ST.isShaderEnv()) {
774774
unsigned Alignment = (unsigned)GVar->getAlign().valueOrOne().value();
775775
buildOpDecorate(Reg, MIRBuilder, SPIRV::Decoration::Alignment, {Alignment});
776776
}
@@ -982,7 +982,7 @@ SPIRVType *SPIRVGlobalRegistry::getOpTypeStruct(
982982
Register ResVReg = createTypeVReg(MIRBuilder);
983983
if (Ty->hasName())
984984
buildOpName(ResVReg, Ty->getName(), MIRBuilder);
985-
if (Ty->isPacked() && !ST.isVulkanEnv())
985+
if (Ty->isPacked() && !ST.isShaderEnv())
986986
buildOpDecorate(ResVReg, MIRBuilder, SPIRV::Decoration::CPacked, {});
987987

988988
SPIRVType *SPVType =

0 commit comments

Comments
 (0)