mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1656 from amdrexu/bugfix

Browse Source 
Fix xfb_stride incorrectness(#1654)
This commit is contained in:
John Kessenich 2019-01-17 21:53:34 -07:00 committed by GitHub
commit 493dee0ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/440.vert.out
View File

@ -166,7 +166,7 @@ Linked vertex stage:
ERROR: Linking vertex stage: Missing entry point: Each stage requires one entry point ERROR: Linking vertex stage: Missing entry point: Each stage requires one entry point
ERROR: Linking vertex stage: xfb_stride is too small to hold all buffer entries: ERROR: Linking vertex stage: xfb_stride is too small to hold all buffer entries:
ERROR: xfb_buffer 0, xfb_stride 92, minimum stride needed: 96 ERROR: xfb_buffer 0, xfb_stride 92, minimum stride needed: 96
ERROR: Linking vertex stage: xfb_stride must be multiple of 8 for buffer holding a double: ERROR: Linking vertex stage: xfb_stride must be multiple of 8 for buffer holding a double or 64-bit integer:
ERROR: xfb_buffer 0, xfb_stride 92 ERROR: xfb_buffer 0, xfb_stride 92
ERROR: Linking vertex stage: xfb_stride must be multiple of 4: ERROR: Linking vertex stage: xfb_stride must be multiple of 4:
ERROR: xfb_buffer 5, xfb_stride 6 ERROR: xfb_buffer 5, xfb_stride 6

8
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -7270,12 +7270,12 @@ void TParseContext::fixXfbOffsets(TQualifier& qualifier, TTypeList& typeList)
int nextOffset = qualifier.layoutXfbOffset; int nextOffset = qualifier.layoutXfbOffset;
for (unsigned int member = 0; member < typeList.size(); ++member) { for (unsigned int member = 0; member < typeList.size(); ++member) {
TQualifier& memberQualifier = typeList[member].type->getQualifier(); TQualifier& memberQualifier = typeList[member].type->getQualifier();
bool containsDouble = false; bool contains64BitType = false;
int memberSize = intermediate.computeTypeXfbSize(*typeList[member].type, containsDouble); int memberSize = intermediate.computeTypeXfbSize(*typeList[member].type, contains64BitType);
// see if we need to auto-assign an offset to this member // see if we need to auto-assign an offset to this member
if (! memberQualifier.hasXfbOffset()) { if (! memberQualifier.hasXfbOffset()) {
// "if applied to an aggregate containing a double, the offset must also be a multiple of 8" // "if applied to an aggregate containing a double or 64-bit integer, the offset must also be a multiple of 8"
if (containsDouble) if (contains64BitType)
RoundToPow2(nextOffset, 8); RoundToPow2(nextOffset, 8);
memberQualifier.layoutXfbOffset = nextOffset; memberQualifier.layoutXfbOffset = nextOffset;
} else } else

44
glslang/MachineIndependent/linkValidate.cpp
View File

@ -222,8 +222,8 @@ void TIntermediate::mergeModes(TInfoSink& infoSink, TIntermediate& unit)
else if (xfbBuffers[b].stride != unit.xfbBuffers[b].stride) else if (xfbBuffers[b].stride != unit.xfbBuffers[b].stride)
error(infoSink, "Contradictory xfb_stride"); error(infoSink, "Contradictory xfb_stride");
xfbBuffers[b].implicitStride = std::max(xfbBuffers[b].implicitStride, unit.xfbBuffers[b].implicitStride); xfbBuffers[b].implicitStride = std::max(xfbBuffers[b].implicitStride, unit.xfbBuffers[b].implicitStride);
if (unit.xfbBuffers[b].containsDouble) if (unit.xfbBuffers[b].contains64BitType)
xfbBuffers[b].containsDouble = true; xfbBuffers[b].contains64BitType = true;
// TODO: 4.4 link: enhanced layouts: compare ranges // TODO: 4.4 link: enhanced layouts: compare ranges
} }
@ -634,7 +634,7 @@ void TIntermediate::finalCheck(TInfoSink& infoSink, bool keepUncalled)
error(infoSink, "Cannot use both gl_FragColor and gl_FragData"); error(infoSink, "Cannot use both gl_FragColor and gl_FragData");
for (size_t b = 0; b < xfbBuffers.size(); ++b) { for (size_t b = 0; b < xfbBuffers.size(); ++b) {
if (xfbBuffers[b].containsDouble) if (xfbBuffers[b].contains64BitType)
RoundToPow2(xfbBuffers[b].implicitStride, 8); RoundToPow2(xfbBuffers[b].implicitStride, 8);
// "It is a compile-time or link-time error to have // "It is a compile-time or link-time error to have
@ -650,10 +650,10 @@ void TIntermediate::finalCheck(TInfoSink& infoSink, bool keepUncalled)
xfbBuffers[b].stride = xfbBuffers[b].implicitStride; xfbBuffers[b].stride = xfbBuffers[b].implicitStride;
// "If the buffer is capturing any // "If the buffer is capturing any
// outputs with double-precision components, the stride must be a multiple of 8, otherwise it must be a // outputs with double-precision or 64-bit integer components, the stride must be a multiple of 8, otherwise it must be a
// multiple of 4, or a compile-time or link-time error results." // multiple of 4, or a compile-time or link-time error results."
if (xfbBuffers[b].containsDouble && ! IsMultipleOfPow2(xfbBuffers[b].stride, 8)) { if (xfbBuffers[b].contains64BitType && ! IsMultipleOfPow2(xfbBuffers[b].stride, 8)) {
error(infoSink, "xfb_stride must be multiple of 8 for buffer holding a double:"); error(infoSink, "xfb_stride must be multiple of 8 for buffer holding a double or 64-bit integer:");
infoSink.info.prefix(EPrefixError); infoSink.info.prefix(EPrefixError);
infoSink.info << " xfb_buffer " << (unsigned int)b << ", xfb_stride " << xfbBuffers[b].stride << "\n"; infoSink.info << " xfb_buffer " << (unsigned int)b << ", xfb_stride " << xfbBuffers[b].stride << "\n";
} else if (! IsMultipleOfPow2(xfbBuffers[b].stride, 4)) { } else if (! IsMultipleOfPow2(xfbBuffers[b].stride, 4)) {
@ -1260,7 +1260,7 @@ int TIntermediate::addXfbBufferOffset(const TType& type)
TXfbBuffer& buffer = xfbBuffers[qualifier.layoutXfbBuffer]; TXfbBuffer& buffer = xfbBuffers[qualifier.layoutXfbBuffer];
// compute the range // compute the range
unsigned int size = computeTypeXfbSize(type, buffer.containsDouble); unsigned int size = computeTypeXfbSize(type, buffer.contains64BitType);
buffer.implicitStride = std::max(buffer.implicitStride, qualifier.layoutXfbOffset + size); buffer.implicitStride = std::max(buffer.implicitStride, qualifier.layoutXfbOffset + size);
TRange range(qualifier.layoutXfbOffset, qualifier.layoutXfbOffset + size - 1); TRange range(qualifier.layoutXfbOffset, qualifier.layoutXfbOffset + size - 1);
@ -1279,11 +1279,11 @@ int TIntermediate::addXfbBufferOffset(const TType& type)
// Recursively figure out how many bytes of xfb buffer are used by the given type. // Recursively figure out how many bytes of xfb buffer are used by the given type.
// Return the size of type, in bytes. // Return the size of type, in bytes.
// Sets containsDouble to true if the type contains a double. // Sets contains64BitType to true if the type contains a double.
// N.B. Caller must set containsDouble to false before calling. // N.B. Caller must set contains64BitType to false before calling.
unsigned int TIntermediate::computeTypeXfbSize(const TType& type, bool& containsDouble) const unsigned int TIntermediate::computeTypeXfbSize(const TType& type, bool& contains64BitType) const
{ {
// "...if applied to an aggregate containing a double, the offset must also be a multiple of 8, // "...if applied to an aggregate containing a double or 64-bit integer, the offset must also be a multiple of 8,
// and the space taken in the buffer will be a multiple of 8. // and the space taken in the buffer will be a multiple of 8.
// ...within the qualified entity, subsequent components are each // ...within the qualified entity, subsequent components are each
// assigned, in order, to the next available offset aligned to a multiple of // assigned, in order, to the next available offset aligned to a multiple of
@ -1294,28 +1294,28 @@ unsigned int TIntermediate::computeTypeXfbSize(const TType& type, bool& contains
// TODO: perf: this can be flattened by using getCumulativeArraySize(), and a deref that discards all arrayness // TODO: perf: this can be flattened by using getCumulativeArraySize(), and a deref that discards all arrayness
assert(type.isSizedArray()); assert(type.isSizedArray());
TType elementType(type, 0); TType elementType(type, 0);
return type.getOuterArraySize() * computeTypeXfbSize(elementType, containsDouble); return type.getOuterArraySize() * computeTypeXfbSize(elementType, contains64BitType);
} }
if (type.isStruct()) { if (type.isStruct()) {
unsigned int size = 0; unsigned int size = 0;
bool structContainsDouble = false; bool structContains64BitType = false;
for (int member = 0; member < (int)type.getStruct()->size(); ++member) { for (int member = 0; member < (int)type.getStruct()->size(); ++member) {
TType memberType(type, member); TType memberType(type, member);
// "... if applied to // "... if applied to
// an aggregate containing a double, the offset must also be a multiple of 8, // an aggregate containing a double or 64-bit integer, the offset must also be a multiple of 8,
// and the space taken in the buffer will be a multiple of 8." // and the space taken in the buffer will be a multiple of 8."
bool memberContainsDouble = false; bool memberContains64BitType = false;
int memberSize = computeTypeXfbSize(memberType, memberContainsDouble); int memberSize = computeTypeXfbSize(memberType, memberContains64BitType);
if (memberContainsDouble) { if (memberContains64BitType) {
structContainsDouble = true; structContains64BitType = true;
RoundToPow2(size, 8); RoundToPow2(size, 8);
} }
size += memberSize; size += memberSize;
} }
if (structContainsDouble) { if (structContains64BitType) {
containsDouble = true; contains64BitType = true;
RoundToPow2(size, 8); RoundToPow2(size, 8);
} }
return size; return size;
@ -1333,8 +1333,8 @@ unsigned int TIntermediate::computeTypeXfbSize(const TType& type, bool& contains
numComponents = 1; numComponents = 1;
} }
if (type.getBasicType() == EbtDouble) { if (type.getBasicType() == EbtDouble || type.getBasicType() == EbtInt64 || type.getBasicType() == EbtUint64) {
containsDouble = true; contains64BitType = true;
return 8 * numComponents; return 8 * numComponents;
} else } else
return 4 * numComponents; return 4 * numComponents;

6
glslang/MachineIndependent/localintermediate.h
View File

@ -149,11 +149,11 @@ struct TOffsetRange {
// Things that need to be tracked per xfb buffer. // Things that need to be tracked per xfb buffer.
struct TXfbBuffer { struct TXfbBuffer {
TXfbBuffer() : stride(TQualifier::layoutXfbStrideEnd), implicitStride(0), containsDouble(false) { } TXfbBuffer() : stride(TQualifier::layoutXfbStrideEnd), implicitStride(0), contains64BitType(false) { }
std::vector<TRange> ranges; // byte offsets that have already been assigned std::vector<TRange> ranges; // byte offsets that have already been assigned
unsigned int stride; unsigned int stride;
unsigned int implicitStride; unsigned int implicitStride;
bool containsDouble; bool contains64BitType;
}; };
// Track a set of strings describing how the module was processed. // Track a set of strings describing how the module was processed.
@ -640,7 +640,7 @@ public:
} }
unsigned getXfbStride(int buffer) const { return xfbBuffers[buffer].stride; } unsigned getXfbStride(int buffer) const { return xfbBuffers[buffer].stride; }
int addXfbBufferOffset(const TType&); int addXfbBufferOffset(const TType&);
unsigned int computeTypeXfbSize(const TType&, bool& containsDouble) const; unsigned int computeTypeXfbSize(const TType&, bool& contains64BitType) const;
static int getBaseAlignmentScalar(const TType&, int& size); static int getBaseAlignmentScalar(const TType&, int& size);
static int getBaseAlignment(const TType&, int& size, int& stride, TLayoutPacking layoutPacking, bool rowMajor); static int getBaseAlignment(const TType&, int& size, int& stride, TLayoutPacking layoutPacking, bool rowMajor);
static int getScalarAlignment(const TType&, int& size, int& stride, bool rowMajor); static int getScalarAlignment(const TType&, int& size, int& stride, bool rowMajor);

8
hlsl/hlslParseHelper.cpp
View File

@ -8698,12 +8698,12 @@ void HlslParseContext::fixXfbOffsets(TQualifier& qualifier, TTypeList& typeList)
int nextOffset = qualifier.layoutXfbOffset; int nextOffset = qualifier.layoutXfbOffset;
for (unsigned int member = 0; member < typeList.size(); ++member) { for (unsigned int member = 0; member < typeList.size(); ++member) {
TQualifier& memberQualifier = typeList[member].type->getQualifier(); TQualifier& memberQualifier = typeList[member].type->getQualifier();
bool containsDouble = false; bool contains64BitType = false;
int memberSize = intermediate.computeTypeXfbSize(*typeList[member].type, containsDouble); int memberSize = intermediate.computeTypeXfbSize(*typeList[member].type, contains64BitType);
// see if we need to auto-assign an offset to this member // see if we need to auto-assign an offset to this member
if (! memberQualifier.hasXfbOffset()) { if (! memberQualifier.hasXfbOffset()) {
// "if applied to an aggregate containing a double, the offset must also be a multiple of 8" // "if applied to an aggregate containing a double or 64-bit integer, the offset must also be a multiple of 8"
if (containsDouble) if (contains64BitType)
RoundToPow2(nextOffset, 8); RoundToPow2(nextOffset, 8);
memberQualifier.layoutXfbOffset = nextOffset; memberQualifier.layoutXfbOffset = nextOffset;
} else } else