Skip to content

Commit 142cb87

Browse files
johnkslangjohnkslang
authored
Merge pull request KhronosGroup#2387 from BNieuwenhuizen/nonuniform
NonUniform SPIR-V fixes.
2 parents 740ae9f + 8eb0bdc commit 142cb87

File tree

5 files changed

+145
-93
lines changed

5 files changed

+145
-93
lines changed

‎SPIRV/GlslangToSpv.cpp

+18-19
Original file line numberDiff line numberDiff line change
@@ -2308,7 +2308,8 @@ bool TGlslangToSpvTraverser::visitUnary(glslang::TVisit /* visit */, glslang::TI
23082308

23092309
// The result of operation is always stored, but conditionally the
23102310
// consumed result. The consumed result is always an r-value.
2311-
builder.accessChainStore(result);
2311+
builder.accessChainStore(result,
2312+
TranslateNonUniformDecoration(node->getOperand()->getType().getQualifier()));
23122313
builder.clearAccessChain();
23132314
if (node->getOp() == glslang::EOpPreIncrement ||
23142315
node->getOp() == glslang::EOpPreDecrement)
@@ -2384,6 +2385,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
23842385
spv::Id invertedType = spv::NoType; // to use to override the natural type of the node
23852386
std::vector<spv::Builder::AccessChain> complexLvalues; // for holding swizzling l-values too complex for
23862387
// SPIR-V, for an out parameter
2388+
std::vector<glslang::TQualifier> complexLValueQualifiers;
23872389
std::vector<spv::Id> temporaryLvalues; // temporaries to pass, as proxies for complexLValues
23882390

23892391
auto resultType = [&invertedType, &node, this](){ return invertedType != spv::NoType ?
@@ -2627,6 +2629,10 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
26272629
else
26282630
constructed = builder.createConstructor(precision, arguments, resultType());
26292631

2632+
if (node->getType().getQualifier().isNonUniform()) {
2633+
builder.addDecoration(constructed, spv::DecorationNonUniformEXT);
2634+
}
2635+
26302636
builder.clearAccessChain();
26312637
builder.setAccessChainRValue(constructed);
26322638

@@ -3001,6 +3007,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
30013007
// receive the result, and must later swizzle that into the original
30023008
// l-value.
30033009
complexLvalues.push_back(builder.getAccessChain());
3010+
complexLValueQualifiers.push_back(glslangOperands[arg]->getAsTyped()->getType().getQualifier());
30043011
temporaryLvalues.push_back(builder.createVariable(
30053012
spv::NoPrecision, spv::StorageClassFunction,
30063013
builder.accessChainGetInferredType(), "swizzleTemp"));
@@ -3105,7 +3112,7 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
31053112

31063113
for (unsigned int i = 0; i < temporaryLvalues.size(); ++i) {
31073114
builder.setAccessChain(complexLvalues[i]);
3108-
builder.accessChainStore(builder.createLoad(temporaryLvalues[i], spv::NoPrecision));
3115+
builder.accessChainStore(builder.createLoad(temporaryLvalues[i], spv::NoPrecision), TranslateNonUniformDecoration(complexLValueQualifiers[i]));
31093116
}
31103117
}
31113118

@@ -4170,7 +4177,7 @@ void TGlslangToSpvTraverser::accessChainStore(const glslang::TType& type, spv::I
41704177
unsigned int alignment = builder.getAccessChain().alignment;
41714178
alignment |= type.getBufferReferenceAlignment();
41724179

4173-
builder.accessChainStore(rvalue,
4180+
builder.accessChainStore(rvalue, TranslateNonUniformDecoration(type.getQualifier()),
41744181
spv::MemoryAccessMask(TranslateMemoryAccess(coherentFlags) &
41754182
~spv::MemoryAccessMakePointerVisibleKHRMask),
41764183
TranslateMemoryScope(coherentFlags), alignment);
@@ -4766,12 +4773,15 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
47664773

47674774
const bool isUnsignedResult = node->getType().getBasicType() == glslang::EbtUint;
47684775

4776+
if (builder.isSampledImage(params.sampler) &&
4777+
((cracked.query && node->getOp() != glslang::EOpTextureQueryLod) || cracked.fragMask || cracked.fetch)) {
4778+
params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
4779+
if (imageType.getQualifier().isNonUniform()) {
4780+
builder.addDecoration(params.sampler, spv::DecorationNonUniformEXT);
4781+
}
4782+
}
47694783
// Check for queries
47704784
if (cracked.query) {
4771-
// OpImageQueryLod works on a sampled image, for other queries the image has to be extracted first
4772-
if (node->getOp() != glslang::EOpTextureQueryLod && builder.isSampledImage(params.sampler))
4773-
params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
4774-
47754785
switch (node->getOp()) {
47764786
case glslang::EOpImageQuerySize:
47774787
case glslang::EOpTextureQuerySize:
@@ -5025,10 +5035,6 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
50255035
auto opIt = arguments.begin();
50265036
std::vector<spv::Id> operands;
50275037

5028-
// Extract the image if necessary
5029-
if (builder.isSampledImage(params.sampler))
5030-
params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
5031-
50325038
operands.push_back(params.sampler);
50335039
++opIt;
50345040

@@ -5089,13 +5095,6 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
50895095
bias = true;
50905096
}
50915097

5092-
// See if the sampler param should really be just the SPV image part
5093-
if (cracked.fetch) {
5094-
// a fetch needs to have the image extracted first
5095-
if (builder.isSampledImage(params.sampler))
5096-
params.sampler = builder.createUnaryOp(spv::OpImage, builder.getImageType(params.sampler), params.sampler);
5097-
}
5098-
50995098
#ifndef GLSLANG_WEB
51005099
if (cracked.gather) {
51015100
const auto& sourceExtensions = glslangIntermediate->getRequestedExtensions();
@@ -5255,7 +5254,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
52555254

52565255
builder.accessChainPush(builder.makeIntConstant(i), flags, 0);
52575256
builder.accessChainStore(builder.createCompositeExtract(res, builder.getContainedTypeId(resType, i+1),
5258-
i+1));
5257+
i+1), TranslateNonUniformDecoration(imageType.getQualifier()));
52595258
}
52605259
return builder.createCompositeExtract(res, resultType(), 0);
52615260
}

‎SPIRV/SpvBuilder.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -2761,12 +2761,14 @@ void Builder::accessChainPushSwizzle(std::vector<unsigned>& swizzle, Id preSwizz
27612761
}
27622762

27632763
// Comments in header
2764-
void Builder::accessChainStore(Id rvalue, spv::MemoryAccessMask memoryAccess, spv::Scope scope, unsigned int alignment)
2764+
void Builder::accessChainStore(Id rvalue, Decoration nonUniform, spv::MemoryAccessMask memoryAccess, spv::Scope scope, unsigned int alignment)
27652765
{
27662766
assert(accessChain.isRValue == false);
27672767

27682768
transferAccessChainSwizzle(true);
27692769
Id base = collapseAccessChain();
2770+
addDecoration(base, nonUniform);
2771+
27702772
Id source = rvalue;
27712773

27722774
// dynamic component should be gone

‎SPIRV/SpvBuilder.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,8 @@ class Builder {
721721
}
722722

723723
// use accessChain and swizzle to store value
724-
void accessChainStore(Id rvalue, spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone,
724+
void accessChainStore(Id rvalue, Decoration nonUniform,
725+
spv::MemoryAccessMask memoryAccess = spv::MemoryAccessMaskNone,
725726
spv::Scope scope = spv::ScopeMax, unsigned int alignment = 0);
726727

727728
// use accessChain and swizzle to load an r-value

0 commit comments

Comments
 (0)