glslang AEP: Geometry shader features nominally working. (Full semantic check…

Test/310.comp

@@ -223,3 +223,11 @@ void foomultio()
     wo.values[2] = 3.4;
     wo.value = 2;                // ERROR, readonly
 }
+
+in inb {     // ERROR
+    int a;
+} inbi;
+
+out outb {     // ERROR
+    int a;
+} outbi;

Test/310.geom

@@ -8,6 +8,8 @@ in fromVertex {
     in vec3 color;
 } fromV[];
 
+in vec4 nonBlockUnsized[];
+
 out toFragment {
     out vec3 color;
 } toF;
@@ -34,37 +36,19 @@ void main()
     EndStreamPrimitive(0);  // ERROR
 
     color = fromV[0].color;
-    gl_ClipDistance[3] = gl_in[1].gl_ClipDistance[2];
+    gl_ClipDistance[3] =              // ERROR, no ClipDistance
+        gl_in[1].gl_ClipDistance[2];  // ERROR, no ClipDistance
     gl_Position = gl_in[0].gl_Position;
     gl_PointSize = gl_in[3].gl_PointSize;
     gl_PrimitiveID = gl_PrimitiveIDIn;
     gl_Layer = 2;
 }
 
-out vec4 ov0;  // stream should be 0
-layout(stream = 4) out vec4 ov4;
-out vec4 o1v0;  // stream should be 0
-
-layout(stream = 3) uniform;        // ERROR
-layout(stream = 3) in;             // ERROR
-layout(stream = 3) uniform int ua; // ERROR
-layout(stream = 3) uniform ubb { int ua; } ibb; // ERROR
-
-layout(line_strip, points, triangle_strip, stream = 3, points, triangle_strip) out;  // just means "stream = 3, triangle_strip"
-layout(stream = 3, triangle_strip) out;
-out vec4 ov3;  // stream should be 3
-
-layout(stream = 6) out ooutb { vec4 a; } ouuaa6;
+layout(stream = 4) out vec4 ov4; // ERROR, no streams
 
-layout(stream = 6) out ooutb2 {
-    layout(stream = 6) vec4 a;
-} ouua6;
+layout(line_strip, points, triangle_strip, points, triangle_strip) out;  // just means triangle_strip"
 
-layout(stream = 7) out ooutb3 {
-    layout(stream = 6) vec4 a;  // ERROR
-} ouua7;
-
-out vec4 ov2s3;  // stream should be 3
+out ooutb { vec4 a; } ouuaa6;
 
 layout(max_vertices = 200) out;
 layout(max_vertices = 300) out;   // ERROR, too big
@@ -73,8 +57,8 @@ void foo(layout(max_vertices = 4) int a)  // ERROR
     ouuaa6.a = vec4(1.0);
 }
 
-layout(line_strip, points, triangle_strip, stream = 3, points) out;  // ERROR, changing output primitive
-layout(line_strip, points, stream = 3) out; // ERROR, changing output primitive
+layout(line_strip, points, triangle_strip, points) out;  // ERROR, changing output primitive
+layout(line_strip, points) out; // ERROR, changing output primitive
 layout(triangle_strip) in; // ERROR, not an input primitive
 layout(triangle_strip) uniform; // ERROR
 layout(triangle_strip) out vec4 badv4;  // ERROR, not on a variable
@@ -92,10 +76,6 @@ layout(triangles) in;             // ERROR, can't change it
 layout(triangles_adjacency) in;   // ERROR, can't change it
 layout(invocations = 4) in;       // ERROR, not until 4.0
 
-in inbn {
-    layout(stream = 2) int a;     // ERROR, stream on input
-} inbi[];
-
 in sameName {
     int a15;
 } insn[];
@@ -108,36 +88,23 @@ uniform sameName {
     bool b15;
 };
 
-float summ = gl_MaxVertexAttribs +
-             gl_MaxVertexUniformComponents +
-             gl_MaxVaryingFloats +
-             gl_MaxVaryingComponents +
-             gl_MaxVertexOutputComponents  +
-             gl_MaxGeometryInputComponents  +
-             gl_MaxGeometryOutputComponents  +
-             gl_MaxFragmentInputComponents  +
+const int summ = gl_MaxVertexAttribs +
+             gl_MaxGeometryInputComponents +
+             gl_MaxGeometryOutputComponents +
+             gl_MaxGeometryImageUniforms +
+             gl_MaxGeometryTextureImageUnits +
+             gl_MaxGeometryOutputVertices +
+             gl_MaxGeometryTotalOutputComponents +
+             gl_MaxGeometryUniformComponents +
+             gl_MaxGeometryAtomicCounters +
+             gl_MaxGeometryAtomicCounterBuffers +
              gl_MaxVertexTextureImageUnits +
              gl_MaxCombinedTextureImageUnits +
              gl_MaxTextureImageUnits +
-             gl_MaxFragmentUniformComponents +
-             gl_MaxDrawBuffers +
-             gl_MaxClipDistances  +
-             gl_MaxGeometryTextureImageUnits +
-             gl_MaxGeometryOutputVertices +
-             gl_MaxGeometryTotalOutputComponents  +
-             gl_MaxGeometryUniformComponents  +
-             gl_MaxGeometryVaryingComponents;
+             gl_MaxDrawBuffers;
 
 void fooe1()
 {
-    gl_ViewportIndex = gl_MaxViewports - 1;
+    gl_ViewportIndex;  // ERROR, not in ES
+    gl_MaxViewports;   // ERROR, not in ES
 }
-
-#extension GL_ARB_viewport_array : enable
-
-void fooe2()
-{
-    gl_ViewportIndex = gl_MaxViewports - 1;
-}
-
-out int gl_ViewportIndex;

Test/430.comp

@@ -77,3 +77,11 @@ void fooaoeu() {
      int i = globalCoef;            // ERROR, can't convert from double to int
      double di = i;
 }
+
+in inb {     // ERROR
+    int a;
+} inbi;
+
+out outb {     // ERROR
+    int a;
+} outbi;

Test/baseResults/300layout.vert.out

@@ -11,7 +11,7 @@ ERROR: 0:21: 'bad1' : member of block cannot have a packing layout qualifier
 ERROR: 0:22: 'bad2' : member of block cannot have a packing layout qualifier 
 ERROR: 0:23: 'bad3' : member of block cannot have a packing layout qualifier 
 ERROR: 0:31: 'T3' : nameless block contains a member that already has a name at global scope 
-ERROR: 0:38: 'output block' : not supported with this profile: es
+ERROR: 0:38: 'vertex output block' : not supported for this version or the enabled extensions 
 ERROR: 0:42: 'location qualifier on output' : not supported in this stage: vertex
 ERROR: 0:42: 'location qualifier on output' : not supported for this version or the enabled extensions 
 ERROR: 0:50: 'shared' : not supported for this version or the enabled extensions 

Test/baseResults/310.comp.out

@@ -72,7 +72,9 @@ ERROR: 0:207: 'constructor' : can't read from writeonly object:  wo
 ERROR: 0:208: '~' : can't read from writeonly object:  wo
 ERROR: 0:221: 'assign' : can't read from writeonly object:  wo
 ERROR: 0:222: '~' : can't read from writeonly object:  wo
-ERROR: 72 compilation errors.  No code generated.
+ERROR: 0:227: 'input block' : not supported in this stage: compute
+ERROR: 0:231: 'output block' : not supported in this stage: compute
+ERROR: 74 compilation errors.  No code generated.
 
 
 Shader version: 310
@@ -479,6 +481,8 @@ ERROR: node is still EOpNull!
 0:?     'badQ3' (layout(rgba16ui ) coherent volatile restrict uniform highp uimage2D)
 0:?     'wo' (layout(column_major shared ) writeonly buffer block{layout(column_major shared ) buffer highp int value, layout(column_major shared ) buffer implicitly-sized array of highp float values})
 0:?     'multio' (layout(column_major shared ) buffer block{layout(column_major shared ) readonly buffer highp int value, layout(column_major shared ) writeonly buffer implicitly-sized array of highp float values})
+0:?     'inbi' (in block{in highp int a})
+0:?     'outbi' (out block{out highp int a})
 
 
 Linked compute stage:
@@ -888,4 +892,6 @@ ERROR: node is still EOpNull!
 0:?     'badQ3' (layout(rgba16ui ) coherent volatile restrict uniform highp uimage2D)
 0:?     'wo' (layout(column_major shared ) writeonly buffer block{layout(column_major shared ) buffer highp int value, layout(column_major shared ) buffer implicitly-sized array of highp float values})
 0:?     'multio' (layout(column_major shared ) buffer block{layout(column_major shared ) readonly buffer highp int value, layout(column_major shared ) writeonly buffer implicitly-sized array of highp float values})
+0:?     'inbi' (in block{in highp int a})
+0:?     'outbi' (out block{out highp int a})
 

Test/baseResults/430.comp.out

@@ -15,7 +15,9 @@ ERROR: 0:51: 'local_size' : can only apply to 'in'
 ERROR: 0:51: 'local_size' : can only apply to 'in' 
 ERROR: 0:65: 'assign' :  l-value required "ro" (can't modify a readonly buffer)
 ERROR: 0:77: '=' :  cannot convert from 'temp double' to 'temp int'
-ERROR: 15 compilation errors.  No code generated.
+ERROR: 0:81: 'input block' : not supported in this stage: compute
+ERROR: 0:85: 'output block' : not supported in this stage: compute
+ERROR: 17 compilation errors.  No code generated.
 
 
 Shader version: 430
@@ -143,6 +145,8 @@ ERROR: node is still EOpNull!
 0:?     'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
 0:?     'roll' (uniform double)
 0:?     'destTex' (writeonly uniform image2D)
+0:?     'inbi' (in block{in int a})
+0:?     'outbi' (out block{out int a})
 
 
 Linked compute stage:
@@ -273,4 +277,6 @@ ERROR: node is still EOpNull!
 0:?     'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
 0:?     'roll' (uniform double)
 0:?     'destTex' (writeonly uniform image2D)
+0:?     'inbi' (in block{in int a})
+0:?     'outbi' (out block{out int a})
 

glslang/MachineIndependent/Initialize.cpp

@@ -622,6 +622,7 @@ void TBuiltIns::initialize(int version, EProfile profile)
             
         "\n");
 
+    // 120 is correct for both ES and desktop
     if (version >= 120) {
         commonBuiltins.append(
             "mat2   outerProduct(vec2 c, vec2 r);"
@@ -653,6 +654,7 @@ void TBuiltIns::initialize(int version, EProfile profile)
             
             "\n");
 
+        // 150 is correct for both ES and desktop
         if (version >= 150) {
             commonBuiltins.append(
                 "float determinant(mat2 m);"
@@ -1043,7 +1045,6 @@ void TBuiltIns::initialize(int version, EProfile profile)
         stageBuiltins[EShLangGeometry].append(
             "void EmitVertex();"
             "void EndPrimitive();"
-            
             "\n");
     }
 
@@ -1569,7 +1570,7 @@ void TBuiltIns::initialize(int version, EProfile profile)
     //
     //============================================================================
 
-    if (version >= 150) {
+    if (profile != EEsProfile && version >= 150) {
         // Note:  "in gl_PerVertex {...} gl_in[gl_MaxPatchVertices];" is declared in initialize() below,
         // as it depends on the resource sizing of gl_MaxPatchVertices.
 
@@ -1603,6 +1604,25 @@ void TBuiltIns::initialize(int version, EProfile profile)
             "patch out float gl_TessLevelOuter[4];"
             "patch out float gl_TessLevelInner[2];"
             "\n");
+    } else {
+        // Note:  "in gl_PerVertex {...} gl_in[gl_MaxPatchVertices];" is declared in initialize() below,
+        // as it depends on the resource sizing of gl_MaxPatchVertices.
+
+        stageBuiltins[EShLangTessControl].append(
+            "in highp int gl_PatchVerticesIn;"
+            "in highp int gl_PrimitiveID;"
+            "in highp int gl_InvocationID;"
+
+            "out gl_PerVertex {"
+                "highp vec4 gl_Position;"
+                "highp float gl_PointSize;"
+                );
+        stageBuiltins[EShLangTessControl].append(
+            "} gl_out[];"
+
+            "patch out highp float gl_TessLevelOuter[4];"
+            "patch out highp float gl_TessLevelInner[2];"
+            "\n");
     }
 
     //============================================================================
@@ -1611,7 +1631,7 @@ void TBuiltIns::initialize(int version, EProfile profile)
     //
     //============================================================================
 
-    if (version >= 150) {
+    if (profile != EEsProfile && version >= 150) {
         // Note:  "in gl_PerVertex {...} gl_in[gl_MaxPatchVertices];" is declared in initialize() below,
         // as it depends on the resource sizing of gl_MaxPatchVertices.
 
@@ -1645,6 +1665,25 @@ void TBuiltIns::initialize(int version, EProfile profile)
         stageBuiltins[EShLangTessEvaluation].append(
             "};"
             "\n");
+    } else {
+        // Note:  "in gl_PerVertex {...} gl_in[gl_MaxPatchVertices];" is declared in initialize() below,
+        // as it depends on the resource sizing of gl_MaxPatchVertices.
+
+        stageBuiltins[EShLangTessEvaluation].append(
+            "in highp int gl_PatchVerticesIn;"
+            "in highp int gl_PrimitiveID;"
+            "in highp vec3 gl_TessCoord;"
+
+            "patch in highp float gl_TessLevelOuter[4];"
+            "patch in highp float gl_TessLevelInner[2];"
+                
+            "out gl_PerVertex {"
+                "vec4 gl_Position;"
+                "float gl_PointSize;"
+            );
+        stageBuiltins[EShLangTessEvaluation].append(
+            "};"
+            "\n");
     }
 
     //============================================================================
@@ -2923,6 +2962,7 @@ void IdentifyBuiltIns(int version, EProfile profile, EShLanguage language, TSymb
     symbolTable.relateToOperator("not",              EOpVectorLogicalNot);
 
     symbolTable.relateToOperator("matrixCompMult",   EOpMul);
+    // 120 and 150 are correct for both ES and desktop
     if (version >= 120) {
         symbolTable.relateToOperator("outerProduct", EOpOuterProduct);
         symbolTable.relateToOperator("transpose", EOpTranspose);

glslang/MachineIndependent/ParseHelper.h

@@ -123,7 +123,8 @@ public:
     bool arrayQualifierError(TSourceLoc, const TQualifier&);
     bool arrayError(TSourceLoc, const TType&);
     void arraySizeRequiredCheck(TSourceLoc, int size);
-    void structArrayCheck(TSourceLoc, TType* structure);
+    void structArrayCheck(TSourceLoc, const TType& structure);
+    void variableArrayUnsizedCheck(TSourceLoc, const TType&, bool initializer);
     void arrayDimError(TSourceLoc);
     void arrayDimCheck(TSourceLoc, TArraySizes* sizes1, TArraySizes* sizes2);
     void arrayDimCheck(TSourceLoc, const TType*, TArraySizes*);
@@ -177,6 +178,7 @@ public:
     TIntermTyped* constructStruct(TIntermNode*, const TType&, int, TSourceLoc);
     TIntermTyped* constructBuiltIn(const TType&, TOperator, TIntermTyped*, TSourceLoc, bool subset);
     void declareBlock(TSourceLoc, TTypeList& typeList, const TString* instanceName = 0, TArraySizes* arraySizes = 0);
+    void blockStageIoCheck(TSourceLoc, TStorageQualifier, TArraySizes*);
     void fixBlockLocations(TSourceLoc, TQualifier&, TTypeList&, bool memberWithLocation, bool memberWithoutLocation);
     void fixBlockXfbOffsets(TQualifier&, TTypeList&);
     void fixBlockUniformOffsets(TQualifier&, TTypeList&);

glslang/MachineIndependent/ShaderLang.cpp

@@ -178,7 +178,7 @@ void InitializeStageSymbolTable(TBuiltIns& builtIns, int version, EProfile profi
 
 //
 // Initialize the full set of shareable symbol tables;
-// The common (cross-stage) and those sharable per-stage.
+// The common (cross-stage) and those shareable per-stage.
 //
 bool InitializeSymbolTables(TInfoSink& infoSink, TSymbolTable** commonTable,  TSymbolTable** symbolTables, int version, EProfile profile)
 {
@@ -191,14 +191,24 @@ bool InitializeSymbolTables(TInfoSink& infoSink, TSymbolTable** commonTable,  TS
         InitializeSymbolTable(builtIns.getCommonString(), version, profile, EShLangFragment, infoSink, *commonTable[EPcFragment]);
 
     // do the per-stage tables
+
+    // always have vertex and fragment
     InitializeStageSymbolTable(builtIns, version, profile, EShLangVertex, infoSink, commonTable, symbolTables);
     InitializeStageSymbolTable(builtIns, version, profile, EShLangFragment, infoSink, commonTable, symbolTables);
-    if (profile != EEsProfile && version >= 150) {
+
+    // check for tessellation
+    if ((profile != EEsProfile && version >= 150) ||
+        (profile == EEsProfile && version >= 310)) {
         InitializeStageSymbolTable(builtIns, version, profile, EShLangTessControl, infoSink, commonTable, symbolTables);
         InitializeStageSymbolTable(builtIns, version, profile, EShLangTessEvaluation, infoSink, commonTable, symbolTables);
     }
-    if (profile != EEsProfile && version >= 150)
+
+    // check for geometry
+    if ((profile != EEsProfile && version >= 150) ||
+        (profile == EEsProfile && version >= 310))
         InitializeStageSymbolTable(builtIns, version, profile, EShLangGeometry, infoSink, commonTable, symbolTables);
+
+    // check for compute
     if ((profile != EEsProfile && version >= 430) ||
         (profile == EEsProfile && version >= 310))
         InitializeStageSymbolTable(builtIns, version, profile, EShLangCompute, infoSink, commonTable, symbolTables);

glslang/MachineIndependent/Versions.cpp

@@ -190,6 +190,15 @@ void TParseContext::initializeExtensionBehavior()
     extensionBehavior[GL_EXT_tessellation_point_size]              = EBhDisablePartial;
     extensionBehavior[GL_EXT_texture_buffer]                       = EBhDisablePartial;
     extensionBehavior[GL_EXT_texture_cube_map_array]               = EBhDisablePartial;
+
+    // OES matching AEP
+    extensionBehavior[GL_OES_geometry_shader]          = EBhDisablePartial;
+    extensionBehavior[GL_OES_gpu_shader5]              = EBhDisablePartial;
+    extensionBehavior[GL_OES_primitive_bounding_box]   = EBhDisablePartial;
+    extensionBehavior[GL_OES_shader_io_blocks]         = EBhDisablePartial;
+    extensionBehavior[GL_OES_tessellation_shader]      = EBhDisablePartial;
+    extensionBehavior[GL_OES_texture_buffer]           = EBhDisablePartial;
+    extensionBehavior[GL_OES_texture_cube_map_array]   = EBhDisablePartial;
 }
 
 // Get code that is not part of a shared symbol table, is specific to this shader,
@@ -222,6 +231,15 @@ const char* TParseContext::getPreamble()
             "#define GL_EXT_tessellation_point_size 1\n"
             "#define GL_EXT_texture_buffer 1\n"
             "#define GL_EXT_texture_cube_map_array 1\n"
+
+            // OES matching AEP
+            "#define GL_OES_geometry_shader 1\n"
+            "#define GL_OES_gpu_shader5 1\n"
+            "#define GL_OES_primitive_bounding_box 1\n"
+            "#define GL_OES_shader_io_blocks 1\n"
+            "#define GL_OES_tessellation_shader 1\n"
+            "#define GL_OES_texture_buffer 1\n"
+            "#define GL_OES_texture_cube_map_array 1\n"
             ;
     } else {
         return
@@ -478,8 +496,9 @@ void TParseContext::updateExtensionBehavior(const char* extension, const char* b
     // update the requested extension
     updateExtensionBehavior(extension, behavior);
 
-    // see if need to propagate to everything in AEP
+    // see if need to propagate to implicitly modified things
     if (strcmp(extension, "GL_ANDROID_extension_pack_es31a") == 0) {
+        // to everything in AEP
         updateExtensionBehavior("GL_KHR_blend_equation_advanced", behaviorString);
         updateExtensionBehavior("GL_OES_sample_variables", behaviorString);
         updateExtensionBehavior("GL_OES_shader_image_atomic", behaviorString);
@@ -493,6 +512,16 @@ void TParseContext::updateExtensionBehavior(const char* extension, const char* b
         updateExtensionBehavior("GL_EXT_texture_buffer", behaviorString);
         updateExtensionBehavior("GL_EXT_texture_cube_map_array", behaviorString);
     }
+    // geometry to io_blocks
+    else if (strcmp(extension, "GL_EXT_geometry_shader") == 0)
+        updateExtensionBehavior("GL_EXT_shader_io_blocks", behaviorString);
+    else if (strcmp(extension, "GL_OES_geometry_shader") == 0)
+        updateExtensionBehavior("GL_OES_shader_io_blocks", behaviorString);
+    // tessellation to io_blocks
+    else if (strcmp(extension, "GL_EXT_tessellation_shader") == 0)
+        updateExtensionBehavior("GL_EXT_shader_io_blocks", behaviorString);
+    else if (strcmp(extension, "GL_OES_tessellation_shader") == 0)
+        updateExtensionBehavior("GL_OES_shader_io_blocks", behaviorString);
 }
 
 void TParseContext::updateExtensionBehavior(const char* extension, TExtensionBehavior behavior)

glslang/MachineIndependent/Versions.h

@@ -115,6 +115,38 @@ const char* const GL_EXT_tessellation_point_size              = "GL_EXT_tessella
 const char* const GL_EXT_texture_buffer                       = "GL_EXT_texture_buffer";
 const char* const GL_EXT_texture_cube_map_array               = "GL_EXT_texture_cube_map_array";
 
+// OES matching AEP
+const char* const GL_OES_geometry_shader                      = "GL_OES_geometry_shader";
+const char* const GL_OES_gpu_shader5                          = "GL_OES_gpu_shader5";
+const char* const GL_OES_primitive_bounding_box               = "GL_OES_primitive_bounding_box";
+const char* const GL_OES_shader_io_blocks                     = "GL_OES_shader_io_blocks";
+const char* const GL_OES_tessellation_shader                  = "GL_OES_tessellation_shader";
+const char* const GL_OES_texture_buffer                       = "GL_OES_texture_buffer";
+const char* const GL_OES_texture_cube_map_array               = "GL_OES_texture_cube_map_array";
+
+// Arrays of extensions for the above AEP duplications
+
+const char* const AEP_geometry_shader[] = { GL_EXT_geometry_shader, GL_OES_geometry_shader };
+const int Num_AEP_geometry_shader = sizeof(AEP_geometry_shader)/sizeof(AEP_geometry_shader[0]);
+
+const char* const AEP_gpu_shader5[] = { GL_EXT_gpu_shader5, GL_OES_gpu_shader5 };
+const int Num_AEP_gpu_shader5 = sizeof(AEP_gpu_shader5)/sizeof(AEP_gpu_shader5[0]);
+
+const char* const AEP_primitive_bounding_box[] = { GL_EXT_primitive_bounding_box, GL_OES_primitive_bounding_box };
+const int Num_AEP_primitive_bounding_box = sizeof(AEP_primitive_bounding_box)/sizeof(AEP_primitive_bounding_box[0]);
+
+const char* const AEP_shader_io_blocks[] = { GL_EXT_shader_io_blocks, GL_OES_shader_io_blocks };
+const int Num_AEP_shader_io_blocks = sizeof(AEP_shader_io_blocks)/sizeof(AEP_shader_io_blocks[0]);
+
+const char* const AEP_tessellation_shader[] = { GL_EXT_tessellation_shader, GL_OES_tessellation_shader };
+const int Num_AEP_tessellation_shader = sizeof(AEP_tessellation_shader)/sizeof(AEP_tessellation_shader[0]);
+
+const char* const AEP_texture_buffer[] = { GL_EXT_texture_buffer, GL_OES_texture_buffer };
+const int Num_AEP_texture_buffer = sizeof(AEP_texture_buffer)/sizeof(AEP_texture_buffer[0]);
+
+const char* const AEP_texture_cube_map_array[] = { GL_EXT_texture_cube_map_array, GL_OES_texture_cube_map_array };
+const int Num_AEP_texture_cube_map_array = sizeof(AEP_texture_cube_map_array)/sizeof(AEP_texture_cube_map_array[0]);
+
 } // end namespace glslang
 
 #endif // _VERSIONS_INCLUDED_

glslang/MachineIndependent/glslang.y

@@ -1919,7 +1919,7 @@ precision_qualifier
 struct_specifier
     : STRUCT IDENTIFIER LEFT_BRACE { parseContext.nestedStructCheck($1.loc); } struct_declaration_list RIGHT_BRACE {
         TType* structure = new TType($5, *$2.string);
-        parseContext.structArrayCheck($2.loc, structure);
+        parseContext.structArrayCheck($2.loc, *structure);
         TVariable* userTypeDef = new TVariable($2.string, *structure, true);
         if (! parseContext.symbolTable.insert(*userTypeDef))
             parseContext.error($2.loc, "redefinition", $2.string->c_str(), "struct");