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

Fix bug of accidentally overriding initial layout location with 0, which does not mean no location. Added in/out structure tests.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22120 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-06-21 19:43:44 +00:00
parent 211cba242b
commit b29ba33089
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Test/300.frag
View File

@ -38,6 +38,16 @@ struct s {
out s badout; // ERROR out s badout; // ERROR
struct S2 {
vec3 c;
float f;
};
in S2 s2;
out vec3 sc;
out float sf;
void main() void main()
{ {
float f; float f;
@ -74,6 +84,9 @@ void main()
f += gl_FragCoord.y; f += gl_FragCoord.y;
gl_FragDepth = f; gl_FragDepth = f;
sc = s2.c;
sf = s2.f;
} }
float imageBuffer; // ERROR, reserved float imageBuffer; // ERROR, reserved

10
Test/300.vert
View File

@ -9,6 +9,13 @@ varying vec2 v2; // ERROR
in vec4 bad[10]; // ERROR in vec4 bad[10]; // ERROR
struct S {
vec3 c;
float f;
};
out S s;
void main() void main()
{ {
int id = gl_VertexID + gl_InstanceID; int id = gl_VertexID + gl_InstanceID;
@ -34,6 +41,9 @@ void main()
gl_Position = m44[2]; gl_Position = m44[2];
gl_PointSize = v2.y; gl_PointSize = v2.y;
s.c = v3;
s.f = dm;
#ifdef GL_ES #ifdef GL_ES
#error GL_ES is set #error GL_ES is set
#else #else

2
glslang/Include/Types.h
View File

@ -687,6 +687,7 @@ public:
const char* getStorageQualifierString() const { return ::getStorageQualifierString(qualifier.storage); } const char* getStorageQualifierString() const { return ::getStorageQualifierString(qualifier.storage); }
const char* getPrecisionQualifierString() const { return ::getPrecisionQualifierString(qualifier.precision); } const char* getPrecisionQualifierString() const { return ::getPrecisionQualifierString(qualifier.precision); }
TTypeList* getStruct() { return structure; } TTypeList* getStruct() { return structure; }
TTypeList* getStruct() const { return structure; }
int getObjectSize() const int getObjectSize() const
{ {
@ -705,7 +706,6 @@ public:
return totalSize; return totalSize;
} }
TTypeList* getStruct() const { return structure; }
TString& getMangledName() TString& getMangledName()
{ {
if (!mangled) { if (!mangled) {

3
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -84,13 +84,10 @@ TParseContext::TParseContext(TSymbolTable& symt, TIntermediate& interm, int v, E
globalUniformDefaults.clear(); globalUniformDefaults.clear();
globalUniformDefaults.layoutMatrix = ElmColumnMajor; globalUniformDefaults.layoutMatrix = ElmColumnMajor;
globalUniformDefaults.layoutPacking = ElpShared; globalUniformDefaults.layoutPacking = ElpShared;
globalUniformDefaults.layoutSlotLocation = 0;
globalInputDefaults.clear(); globalInputDefaults.clear();
globalInputDefaults.layoutSlotLocation = 0;
globalOutputDefaults.clear(); globalOutputDefaults.clear();
globalOutputDefaults.layoutSlotLocation = 0;
} }
// Get code that is not part of a shared symbol table, specific to this shader // Get code that is not part of a shared symbol table, specific to this shader