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

fix g++ compilation issues

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24043 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-11-13 20:50:21 +00:00
parent ec252dfd3b
commit e4f45cbf49
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glslang/MachineIndependent/Makefile
View file

@ -147,4 +147,4 @@ Versions.o: ParseHelper.h Versions.h ../Include/ShHandle.h SymbolTable.h locali
Constant.o: localintermediate.h ../Include/intermediate.h ../Public/ShaderLang.h SymbolTable.h Versions.h Constant.o: localintermediate.h ../Include/intermediate.h ../Public/ShaderLang.h SymbolTable.h Versions.h
limits.o: ParseHelper.h limits.o: ParseHelper.h
linkValidate.o: localintermediate.h linkValidate.o: localintermediate.h
reflection.o: ../Include/Common.h reflection.h localintermediate.h reflection.o: ../Include/Common.h reflection.h localintermediate.h gl_types.h

11
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -3082,11 +3082,10 @@ TIntermTyped* TParseContext::addConstructor(TSourceLoc loc, TIntermNode* node, c
if (op == EOpConstructStruct) if (op == EOpConstructStruct)
memberTypes = type.getStruct()->begin(); memberTypes = type.getStruct()->begin();
const TType* elementType; TType elementType;
elementType.shallowCopy(type);
if (type.isArray()) if (type.isArray())
elementType = &TType(type, 0); // dereferenced type elementType.dereference();
else
elementType = &type;
bool singleArg; bool singleArg;
if (aggrNode) { if (aggrNode) {
@ -3102,7 +3101,7 @@ TIntermTyped* TParseContext::addConstructor(TSourceLoc loc, TIntermNode* node, c
// If structure constructor or array constructor is being called // If structure constructor or array constructor is being called
// for only one parameter inside the structure, we need to call constructStruct function once. // for only one parameter inside the structure, we need to call constructStruct function once.
if (type.isArray()) if (type.isArray())
newNode = constructStruct(node, *elementType, 1, node->getLoc()); newNode = constructStruct(node, elementType, 1, node->getLoc());
else if (op == EOpConstructStruct) else if (op == EOpConstructStruct)
newNode = constructStruct(node, *(*memberTypes).type, 1, node->getLoc()); newNode = constructStruct(node, *(*memberTypes).type, 1, node->getLoc());
else else
@ -3130,7 +3129,7 @@ TIntermTyped* TParseContext::addConstructor(TSourceLoc loc, TIntermNode* node, c
for (TIntermSequence::iterator p = sequenceVector.begin(); for (TIntermSequence::iterator p = sequenceVector.begin();
p != sequenceVector.end(); p++, paramCount++) { p != sequenceVector.end(); p++, paramCount++) {
if (type.isArray()) if (type.isArray())
newNode = constructStruct(*p, *elementType, paramCount+1, node->getLoc()); newNode = constructStruct(*p, elementType, paramCount+1, node->getLoc());
else if (op == EOpConstructStruct) else if (op == EOpConstructStruct)
newNode = constructStruct(*p, *(memberTypes[paramCount]).type, paramCount+1, node->getLoc()); newNode = constructStruct(*p, *(memberTypes[paramCount]).type, paramCount+1, node->getLoc());
else else

4
glslang/MachineIndependent/reflection.cpp
View file

@ -100,7 +100,7 @@ public:
} }
} }
static const int baseAlignmentVec4Std140 = 16; static const int baseAlignmentVec4Std140;
// align a value: if 'value' is not aligned to 'alignment', move it up to a multiple of alignment // align a value: if 'value' is not aligned to 'alignment', move it up to a multiple of alignment
void align(int& value, int alignment) void align(int& value, int alignment)
@ -553,6 +553,8 @@ public:
TReflection& reflection; TReflection& reflection;
}; };
const int TLiveTraverser::baseAlignmentVec4Std140 = 16;
namespace { namespace {
// //