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

Non-functional: Fix tabs.

Browse Source
This commit is contained in:
John Kessenich 2018-04-11 00:03:47 -06:00
parent e891afacf4
commit 461ea09943
7 changed files with 308 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glslang/Include/Common.h
View File

@ -67,19 +67,19 @@ std::string to_string(const T& val) {
#endif #endif
#if defined(_MSC_VER) && _MSC_VER < 1800 #if defined(_MSC_VER) && _MSC_VER < 1800
#include <stdlib.h> #include <stdlib.h>
inline long long int strtoll (const char* str, char** endptr, int base) inline long long int strtoll (const char* str, char** endptr, int base)
{ {
return _strtoi64(str, endptr, base); return _strtoi64(str, endptr, base);
} }
inline unsigned long long int strtoull (const char* str, char** endptr, int base) inline unsigned long long int strtoull (const char* str, char** endptr, int base)
{ {
return _strtoui64(str, endptr, base); return _strtoui64(str, endptr, base);
} }
inline long long int atoll (const char* str) inline long long int atoll (const char* str)
{ {
return strtoll(str, NULL, 10); return strtoll(str, NULL, 10);
} }
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)

2
glslang/Include/revision.h
View File

@ -1,3 +1,3 @@
// This header is generated by the make-revision script. // This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 2689 #define GLSLANG_PATCH_LEVEL 2691

8
glslang/MachineIndependent/Versions.cpp
View File

@ -892,12 +892,12 @@ void TParseVersions::explicitInt16Check(const TSourceLoc& loc, const char* op, b
{ {
if (! builtIn) { if (! builtIn) {
#if AMD_EXTENSIONS #if AMD_EXTENSIONS
const char* const extensions[3] = {E_GL_AMD_gpu_shader_int16, const char* const extensions[3] = {E_GL_AMD_gpu_shader_int16,
E_GL_KHX_shader_explicit_arithmetic_types, E_GL_KHX_shader_explicit_arithmetic_types,
E_GL_KHX_shader_explicit_arithmetic_types_int16}; E_GL_KHX_shader_explicit_arithmetic_types_int16};
#else #else
const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types, const char* const extensions[2] = {E_GL_KHX_shader_explicit_arithmetic_types,
E_GL_KHX_shader_explicit_arithmetic_types_int16}; E_GL_KHX_shader_explicit_arithmetic_types_int16};
#endif #endif
requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types"); requireExtensions(loc, sizeof(extensions)/sizeof(extensions[0]), extensions, "explicit types");
requireProfile(loc, ECoreProfile | ECompatibilityProfile, op); requireProfile(loc, ECoreProfile | ECompatibilityProfile, op);

288
glslang/MachineIndependent/glslang.y
View File

@ -1538,40 +1538,40 @@ type_specifier_nonarray
$$.setVector(4); $$.setVector(4);
} }
| F32VEC2 { | F32VEC2 {
parseContext.explicitFloat32Check($1.loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setVector(2); $$.setVector(2);
} }
| F32VEC3 { | F32VEC3 {
parseContext.explicitFloat32Check($1.loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setVector(3); $$.setVector(3);
} }
| F32VEC4 { | F32VEC4 {
parseContext.explicitFloat32Check($1.loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setVector(4); $$.setVector(4);
} }
| F64VEC2 { | F64VEC2 {
parseContext.explicitFloat64Check($1.loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setVector(2); $$.setVector(2);
} }
| F64VEC3 { | F64VEC3 {
parseContext.explicitFloat64Check($1.loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setVector(3); $$.setVector(3);
} }
| F64VEC4 { | F64VEC4 {
parseContext.explicitFloat64Check($1.loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setVector(4); $$.setVector(4);
} }
| BVEC2 { | BVEC2 {
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
@ -1604,40 +1604,40 @@ type_specifier_nonarray
$$.setVector(4); $$.setVector(4);
} }
| I8VEC2 { | I8VEC2 {
parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt8; $$.basicType = EbtInt8;
$$.setVector(2); $$.setVector(2);
} }
| I8VEC3 { | I8VEC3 {
parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt8; $$.basicType = EbtInt8;
$$.setVector(3); $$.setVector(3);
} }
| I8VEC4 { | I8VEC4 {
parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt8Check($1.loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt8; $$.basicType = EbtInt8;
$$.setVector(4); $$.setVector(4);
} }
| I16VEC2 { | I16VEC2 {
parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt16; $$.basicType = EbtInt16;
$$.setVector(2); $$.setVector(2);
} }
| I16VEC3 { | I16VEC3 {
parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt16; $$.basicType = EbtInt16;
$$.setVector(3); $$.setVector(3);
} }
| I16VEC4 { | I16VEC4 {
parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt16Check($1.loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtInt16; $$.basicType = EbtInt16;
$$.setVector(4); $$.setVector(4);
} }
| I32VEC2 { | I32VEC2 {
parseContext.explicitInt32Check($1.loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt32Check($1.loc, "32-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
@ -1970,148 +1970,148 @@ type_specifier_nonarray
$$.setMatrix(4, 4); $$.setMatrix(4, 4);
} }
| F32MAT2 { | F32MAT2 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(2, 2); $$.setMatrix(2, 2);
} }
| F32MAT3 { | F32MAT3 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(3, 3); $$.setMatrix(3, 3);
} }
| F32MAT4 { | F32MAT4 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(4, 4); $$.setMatrix(4, 4);
} }
| F32MAT2X2 { | F32MAT2X2 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(2, 2); $$.setMatrix(2, 2);
} }
| F32MAT2X3 { | F32MAT2X3 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(2, 3); $$.setMatrix(2, 3);
} }
| F32MAT2X4 { | F32MAT2X4 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(2, 4); $$.setMatrix(2, 4);
} }
| F32MAT3X2 { | F32MAT3X2 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(3, 2); $$.setMatrix(3, 2);
} }
| F32MAT3X3 { | F32MAT3X3 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(3, 3); $$.setMatrix(3, 3);
} }
| F32MAT3X4 { | F32MAT3X4 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(3, 4); $$.setMatrix(3, 4);
} }
| F32MAT4X2 { | F32MAT4X2 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(4, 2); $$.setMatrix(4, 2);
} }
| F32MAT4X3 { | F32MAT4X3 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(4, 3); $$.setMatrix(4, 3);
} }
| F32MAT4X4 { | F32MAT4X4 {
parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check($1.loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtFloat; $$.basicType = EbtFloat;
$$.setMatrix(4, 4); $$.setMatrix(4, 4);
} }
| F64MAT2 { | F64MAT2 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(2, 2); $$.setMatrix(2, 2);
} }
| F64MAT3 { | F64MAT3 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(3, 3); $$.setMatrix(3, 3);
} }
| F64MAT4 { | F64MAT4 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(4, 4); $$.setMatrix(4, 4);
} }
| F64MAT2X2 { | F64MAT2X2 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(2, 2); $$.setMatrix(2, 2);
} }
| F64MAT2X3 { | F64MAT2X3 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(2, 3); $$.setMatrix(2, 3);
} }
| F64MAT2X4 { | F64MAT2X4 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(2, 4); $$.setMatrix(2, 4);
} }
| F64MAT3X2 { | F64MAT3X2 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(3, 2); $$.setMatrix(3, 2);
} }
| F64MAT3X3 { | F64MAT3X3 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(3, 3); $$.setMatrix(3, 3);
} }
| F64MAT3X4 { | F64MAT3X4 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(3, 4); $$.setMatrix(3, 4);
} }
| F64MAT4X2 { | F64MAT4X2 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(4, 2); $$.setMatrix(4, 2);
} }
| F64MAT4X3 { | F64MAT4X3 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(4, 3); $$.setMatrix(4, 3);
} }
| F64MAT4X4 { | F64MAT4X4 {
parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check($1.loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
$$.init($1.loc, parseContext.symbolTable.atGlobalLevel()); $$.init($1.loc, parseContext.symbolTable.atGlobalLevel());
$$.basicType = EbtDouble; $$.basicType = EbtDouble;
$$.setMatrix(4, 4); $$.setMatrix(4, 4);
} }
| ATOMIC_UINT { | ATOMIC_UINT {
parseContext.vulkanRemoved($1.loc, "atomic counter types"); parseContext.vulkanRemoved($1.loc, "atomic counter types");

288
glslang/MachineIndependent/glslang_tab.cpp
View File

@ -6102,10 +6102,10 @@ yyreduce:
case 206: case 206:
#line 1540 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1540 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(2); (yyval.interm.type).setVector(2);
} }
#line 6111 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6111 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6113,10 +6113,10 @@ yyreduce:
case 207: case 207:
#line 1546 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1546 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(3); (yyval.interm.type).setVector(3);
} }
#line 6122 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6122 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6124,10 +6124,10 @@ yyreduce:
case 208: case 208:
#line 1552 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1552 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setVector(4); (yyval.interm.type).setVector(4);
} }
#line 6133 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6133 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6135,10 +6135,10 @@ yyreduce:
case 209: case 209:
#line 1558 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1558 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(2); (yyval.interm.type).setVector(2);
} }
#line 6144 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6144 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6146,10 +6146,10 @@ yyreduce:
case 210: case 210:
#line 1564 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1564 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(3); (yyval.interm.type).setVector(3);
} }
#line 6155 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6155 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6157,10 +6157,10 @@ yyreduce:
case 211: case 211:
#line 1570 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1570 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setVector(4); (yyval.interm.type).setVector(4);
} }
#line 6166 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6166 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6228,10 +6228,10 @@ yyreduce:
case 218: case 218:
#line 1606 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1606 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitInt8Check((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt8Check((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8; (yyval.interm.type).basicType = EbtInt8;
(yyval.interm.type).setVector(2); (yyval.interm.type).setVector(2);
} }
#line 6237 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6237 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6239,10 +6239,10 @@ yyreduce:
case 219: case 219:
#line 1612 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1612 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitInt8Check((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt8Check((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8; (yyval.interm.type).basicType = EbtInt8;
(yyval.interm.type).setVector(3); (yyval.interm.type).setVector(3);
} }
#line 6248 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6248 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6250,10 +6250,10 @@ yyreduce:
case 220: case 220:
#line 1618 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1618 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitInt8Check((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt8Check((yyvsp[0].lex).loc, "8-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt8; (yyval.interm.type).basicType = EbtInt8;
(yyval.interm.type).setVector(4); (yyval.interm.type).setVector(4);
} }
#line 6259 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6259 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6261,10 +6261,10 @@ yyreduce:
case 221: case 221:
#line 1624 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1624 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16; (yyval.interm.type).basicType = EbtInt16;
(yyval.interm.type).setVector(2); (yyval.interm.type).setVector(2);
} }
#line 6270 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6270 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6272,10 +6272,10 @@ yyreduce:
case 222: case 222:
#line 1630 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1630 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16; (yyval.interm.type).basicType = EbtInt16;
(yyval.interm.type).setVector(3); (yyval.interm.type).setVector(3);
} }
#line 6281 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6281 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6283,10 +6283,10 @@ yyreduce:
case 223: case 223:
#line 1636 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1636 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitInt16Check((yyvsp[0].lex).loc, "16-bit signed integer vector", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtInt16; (yyval.interm.type).basicType = EbtInt16;
(yyval.interm.type).setVector(4); (yyval.interm.type).setVector(4);
} }
#line 6292 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6292 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6909,10 +6909,10 @@ yyreduce:
case 281: case 281:
#line 1972 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1972 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2); (yyval.interm.type).setMatrix(2, 2);
} }
#line 6918 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6918 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6920,10 +6920,10 @@ yyreduce:
case 282: case 282:
#line 1978 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1978 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3); (yyval.interm.type).setMatrix(3, 3);
} }
#line 6929 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6929 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6931,10 +6931,10 @@ yyreduce:
case 283: case 283:
#line 1984 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1984 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4); (yyval.interm.type).setMatrix(4, 4);
} }
#line 6940 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6940 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6942,10 +6942,10 @@ yyreduce:
case 284: case 284:
#line 1990 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1990 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 2); (yyval.interm.type).setMatrix(2, 2);
} }
#line 6951 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6951 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6953,10 +6953,10 @@ yyreduce:
case 285: case 285:
#line 1996 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 1996 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 3); (yyval.interm.type).setMatrix(2, 3);
} }
#line 6962 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6962 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6964,10 +6964,10 @@ yyreduce:
case 286: case 286:
#line 2002 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2002 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(2, 4); (yyval.interm.type).setMatrix(2, 4);
} }
#line 6973 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6973 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6975,10 +6975,10 @@ yyreduce:
case 287: case 287:
#line 2008 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2008 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 2); (yyval.interm.type).setMatrix(3, 2);
} }
#line 6984 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6984 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6986,10 +6986,10 @@ yyreduce:
case 288: case 288:
#line 2014 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2014 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 3); (yyval.interm.type).setMatrix(3, 3);
} }
#line 6995 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 6995 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -6997,10 +6997,10 @@ yyreduce:
case 289: case 289:
#line 2020 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2020 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(3, 4); (yyval.interm.type).setMatrix(3, 4);
} }
#line 7006 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7006 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7008,10 +7008,10 @@ yyreduce:
case 290: case 290:
#line 2026 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2026 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 2); (yyval.interm.type).setMatrix(4, 2);
} }
#line 7017 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7017 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7019,10 +7019,10 @@ yyreduce:
case 291: case 291:
#line 2032 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2032 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 3); (yyval.interm.type).setMatrix(4, 3);
} }
#line 7028 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7028 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7030,10 +7030,10 @@ yyreduce:
case 292: case 292:
#line 2038 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2038 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat32Check((yyvsp[0].lex).loc, "float32_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtFloat; (yyval.interm.type).basicType = EbtFloat;
(yyval.interm.type).setMatrix(4, 4); (yyval.interm.type).setMatrix(4, 4);
} }
#line 7039 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7039 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7041,10 +7041,10 @@ yyreduce:
case 293: case 293:
#line 2044 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2044 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2); (yyval.interm.type).setMatrix(2, 2);
} }
#line 7050 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7050 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7052,10 +7052,10 @@ yyreduce:
case 294: case 294:
#line 2050 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2050 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3); (yyval.interm.type).setMatrix(3, 3);
} }
#line 7061 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7061 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7063,10 +7063,10 @@ yyreduce:
case 295: case 295:
#line 2056 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2056 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4); (yyval.interm.type).setMatrix(4, 4);
} }
#line 7072 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7072 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7074,10 +7074,10 @@ yyreduce:
case 296: case 296:
#line 2062 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2062 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 2); (yyval.interm.type).setMatrix(2, 2);
} }
#line 7083 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7083 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7085,10 +7085,10 @@ yyreduce:
case 297: case 297:
#line 2068 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2068 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 3); (yyval.interm.type).setMatrix(2, 3);
} }
#line 7094 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7094 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7096,10 +7096,10 @@ yyreduce:
case 298: case 298:
#line 2074 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2074 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(2, 4); (yyval.interm.type).setMatrix(2, 4);
} }
#line 7105 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7105 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7107,10 +7107,10 @@ yyreduce:
case 299: case 299:
#line 2080 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2080 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 2); (yyval.interm.type).setMatrix(3, 2);
} }
#line 7116 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7116 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7118,10 +7118,10 @@ yyreduce:
case 300: case 300:
#line 2086 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2086 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 3); (yyval.interm.type).setMatrix(3, 3);
} }
#line 7127 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7127 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7129,10 +7129,10 @@ yyreduce:
case 301: case 301:
#line 2092 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2092 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(3, 4); (yyval.interm.type).setMatrix(3, 4);
} }
#line 7138 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7138 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7140,10 +7140,10 @@ yyreduce:
case 302: case 302:
#line 2098 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2098 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 2); (yyval.interm.type).setMatrix(4, 2);
} }
#line 7149 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7149 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7151,10 +7151,10 @@ yyreduce:
case 303: case 303:
#line 2104 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2104 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 3); (yyval.interm.type).setMatrix(4, 3);
} }
#line 7160 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7160 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;
@ -7162,10 +7162,10 @@ yyreduce:
case 304: case 304:
#line 2110 "MachineIndependent/glslang.y" /* yacc.c:1646 */ #line 2110 "MachineIndependent/glslang.y" /* yacc.c:1646 */
{ {
parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel()); parseContext.explicitFloat64Check((yyvsp[0].lex).loc, "float64_t matrix", parseContext.symbolTable.atBuiltInLevel());
(yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel()); (yyval.interm.type).init((yyvsp[0].lex).loc, parseContext.symbolTable.atGlobalLevel());
(yyval.interm.type).basicType = EbtDouble; (yyval.interm.type).basicType = EbtDouble;
(yyval.interm.type).setMatrix(4, 4); (yyval.interm.type).setMatrix(4, 4);
} }
#line 7171 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */ #line 7171 "MachineIndependent/glslang_tab.cpp" /* yacc.c:1646 */
break; break;

2
glslang/Public/ShaderLang.h
View File

@ -671,7 +671,7 @@ public:
int getUniformBlockSize(int blockIndex) const; // can be used for glGetActiveUniformBlockiv(UNIFORM_BLOCK_DATA_SIZE) int getUniformBlockSize(int blockIndex) const; // can be used for glGetActiveUniformBlockiv(UNIFORM_BLOCK_DATA_SIZE)
int getUniformIndex(const char* name) const; // can be used for glGetUniformIndices() int getUniformIndex(const char* name) const; // can be used for glGetUniformIndices()
int getUniformBinding(int index) const; // returns the binding number int getUniformBinding(int index) const; // returns the binding number
int getUniformBlockBinding(int index) const; // returns the block binding number int getUniformBlockBinding(int index) const; // returns the block binding number
int getUniformBlockIndex(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_BLOCK_INDEX) int getUniformBlockIndex(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_BLOCK_INDEX)
int getUniformBlockCounterIndex(int index) const; // returns block index of associated counter. int getUniformBlockCounterIndex(int index) const; // returns block index of associated counter.
int getUniformType(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_TYPE) int getUniformType(int index) const; // can be used for glGetActiveUniformsiv(GL_UNIFORM_TYPE)

2
hlsl/hlslParseHelper.cpp
View File

@ -8629,7 +8629,7 @@ void HlslParseContext::declareBlock(const TSourceLoc& loc, TType& type, const TS
return; return;
} }
// Save it in the AST for linker use. // Save it in the AST for linker use.
if (symbolTable.atGlobalLevel()) if (symbolTable.atGlobalLevel())
trackLinkage(variable); trackLinkage(variable);
} }