BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GLSL/SPV: Fix #1900: Drop const on literal when doing an object copy.

Browse source
This commit is contained in:
John Kessenich 2019-09-20 06:01:42 -06:00
parent f7a48b153f
commit c2fafea970
3 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -2774,10 +2774,25 @@ bool TParseContext::builtInName(const TString& identifier)
//
bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, TFunction& function, TOperator op, TType& type)
{
type.shallowCopy(function.getType());
// See if the constructor does not establish the main type, only requalifies
// it, in which case the type comes from the argument instead of from the
// constructor function.
switch (op) {
case EOpConstructNonuniform:
if (node != nullptr && node->getAsTyped() != nullptr) {
type.shallowCopy(node->getAsTyped()->getType());
type.getQualifier().makeTemporary();
type.getQualifier().nonUniform = true;
}
break;
default:
type.shallowCopy(function.getType());
break;
}
// See if it's a matrix
bool constructingMatrix = false;
switch(op) {
switch (op) {
#ifndef GLSLANG_WEB
case EOpConstructTextureSampler:
return constructorTextureSamplerError(loc, function);
@ -2871,6 +2886,8 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
}
}
}
if (op == EOpConstructNonuniform)
constType = false;
#ifndef GLSLANG_WEB
switch (op) {
@ -7093,8 +7110,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
case EOpConstructNonuniform:
// Make a nonuniform copy of node
newNode = intermediate.addBuiltInFunctionCall(node->getLoc(), EOpCopyObject, true, node, node->getType());
newNode->getWritableType().getQualifier().nonUniform = true;
newNode = intermediate.addBuiltInFunctionCall(node->getLoc(), EOpCopyObject, true, node, type);
return newNode;
case EOpConstructReference: