Skip to content

A
angle
Commit 28b97423 by Jamie Madill Committed by Shannon Woods
Options

Removed code for unsupported pack-unpack language.

Review URL: https://codereview.appspot.com/9685045 git-svn-id: https://angleproject.googlecode.com/svn/trunk@2246 736b8ea6-26fd-11df-bfd4-992fa37f6226 TRAC #23333 Authored-by: alokp@chromium.org Signed-off-by: Shannon Woods Signed-off-by Nicolas Capens Merged-by: Jamie Madill
parent eb1a010f
Showing with 54 additions and 165 deletions
src/compiler/BaseTypes.h
...@@ -116,10 +116,6 @@ enum TQualifier ...@@ -116,10 +116,6 @@ enum TQualifier
EvqVertexInput, // Vertex shader input EvqVertexInput, // Vertex shader input
EvqFragmentOutput, // Fragment shader output EvqFragmentOutput, // Fragment shader output
// pack/unpack input and output
EvqInput,
EvqOutput,
// parameters // parameters
EvqIn, EvqIn,
EvqOut, EvqOut,
...@@ -213,8 +209,6 @@ inline const char* getQualifierString(TQualifier q) ...@@ -213,8 +209,6 @@ inline const char* getQualifierString(TQualifier q)
case EvqIn: return "in"; break; case EvqIn: return "in"; break;
case EvqOut: return "out"; break; case EvqOut: return "out"; break;
case EvqInOut: return "inout"; break; case EvqInOut: return "inout"; break;
case EvqInput: return "input"; break;
case EvqOutput: return "output"; break;
case EvqPosition: return "Position"; break; case EvqPosition: return "Position"; break;
case EvqPointSize: return "PointSize"; break; case EvqPointSize: return "PointSize"; break;
case EvqFragCoord: return "FragCoord"; break; case EvqFragCoord: return "FragCoord"; break;
......
src/compiler/ParseHelper.cpp
...@@ -321,7 +321,6 @@ bool TParseContext::lValueErrorCheck(const TSourceLoc& line, const char* op, TIn ...@@ -321,7 +321,6 @@ bool TParseContext::lValueErrorCheck(const TSourceLoc& line, const char* op, TIn
case EvqVertexInput: message = "can't modify an input"; break; case EvqVertexInput: message = "can't modify an input"; break;
case EvqUniform: message = "can't modify a uniform"; break; case EvqUniform: message = "can't modify a uniform"; break;
case EvqVaryingIn: message = "can't modify a varying"; break; case EvqVaryingIn: message = "can't modify a varying"; break;
case EvqInput: message = "can't modify an input"; break;
case EvqFragCoord: message = "can't modify gl_FragCoord"; break; case EvqFragCoord: message = "can't modify gl_FragCoord"; break;
case EvqFrontFacing: message = "can't modify gl_FrontFacing"; break; case EvqFrontFacing: message = "can't modify gl_FrontFacing"; break;
case EvqPointCoord: message = "can't modify gl_PointCoord"; break; case EvqPointCoord: message = "can't modify gl_PointCoord"; break;
...@@ -1466,19 +1465,19 @@ TFunction *TParseContext::addConstructorFunc(TPublicType publicType) ...@@ -1466,19 +1465,19 @@ TFunction *TParseContext::addConstructorFunc(TPublicType publicType)
// TODO: non-square matrices // TODO: non-square matrices
switch(publicType.getCols()) switch(publicType.getCols())
{ {
case 2: op = EOpConstructMat2; break; case 2: op = EOpConstructMat2; break;
case 3: op = EOpConstructMat3; break; case 3: op = EOpConstructMat3; break;
case 4: op = EOpConstructMat4; break; case 4: op = EOpConstructMat4; break;
} }
} }
else else
{ {
switch(publicType.getNominalSize()) switch(publicType.getNominalSize())
{ {
case 1: op = EOpConstructFloat; break; case 1: op = EOpConstructFloat; break;
case 2: op = EOpConstructVec2; break; case 2: op = EOpConstructVec2; break;
case 3: op = EOpConstructVec3; break; case 3: op = EOpConstructVec3; break;
case 4: op = EOpConstructVec4; break; case 4: op = EOpConstructVec4; break;
} }
} }
break; break;
...@@ -1486,30 +1485,30 @@ TFunction *TParseContext::addConstructorFunc(TPublicType publicType) ...@@ -1486,30 +1485,30 @@ TFunction *TParseContext::addConstructorFunc(TPublicType publicType)
case EbtInt: case EbtInt:
switch(publicType.getNominalSize()) switch(publicType.getNominalSize())
{ {
case 1: op = EOpConstructInt; break; case 1: op = EOpConstructInt; break;
case 2: op = EOpConstructIVec2; break; case 2: op = EOpConstructIVec2; break;
case 3: op = EOpConstructIVec3; break; case 3: op = EOpConstructIVec3; break;
case 4: op = EOpConstructIVec4; break; case 4: op = EOpConstructIVec4; break;
} }
break; break;
case EbtUInt: case EbtUInt:
switch(publicType.getNominalSize()) switch(publicType.getNominalSize())
{ {
case 1: op = EOpConstructUInt; break; case 1: op = EOpConstructUInt; break;
case 2: op = EOpConstructUVec2; break; case 2: op = EOpConstructUVec2; break;
case 3: op = EOpConstructUVec3; break; case 3: op = EOpConstructUVec3; break;
case 4: op = EOpConstructUVec4; break; case 4: op = EOpConstructUVec4; break;
} }
break; break;
case EbtBool: case EbtBool:
switch(publicType.getNominalSize()) switch(publicType.getNominalSize())
{ {
case 1: op = EOpConstructBool; break; case 1: op = EOpConstructBool; break;
case 2: op = EOpConstructBVec2; break; case 2: op = EOpConstructBVec2; break;
case 3: op = EOpConstructBVec3; break; case 3: op = EOpConstructBVec3; break;
case 4: op = EOpConstructBVec4; break; case 4: op = EOpConstructBVec4; break;
} }
break; break;
......
src/compiler/glslang.y
...@@ -105,14 +105,6 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason) ...@@ -105,14 +105,6 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason)
} \ } \
} while (0) } while (0)
#define FRAG_VERT_ONLY(S, L) { \
if (context->shaderType != SH_FRAGMENT_SHADER && \
context->shaderType != SH_VERTEX_SHADER) { \
context->error(L, " supported in vertex/fragment shaders only ", S); \
context->recover(); \
} \
}
#define VERTEX_ONLY(S, L) { \ #define VERTEX_ONLY(S, L) { \
if (context->shaderType != SH_VERTEX_SHADER) { \ if (context->shaderType != SH_VERTEX_SHADER) { \
context->error(L, " supported in vertex shaders only ", S); \ context->error(L, " supported in vertex shaders only ", S); \
...@@ -541,7 +533,6 @@ unary_operator ...@@ -541,7 +533,6 @@ unary_operator
multiplicative_expression multiplicative_expression
: unary_expression { $$ = $1; } : unary_expression { $$ = $1; }
| multiplicative_expression STAR unary_expression { | multiplicative_expression STAR unary_expression {
FRAG_VERT_ONLY("*", @2);
$$ = context->intermediate.addBinaryMath(EOpMul, $1, $3, @2); $$ = context->intermediate.addBinaryMath(EOpMul, $1, $3, @2);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError(@2, "*", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError(@2, "*", $1->getCompleteString(), $3->getCompleteString());
...@@ -550,7 +541,6 @@ multiplicative_expression ...@@ -550,7 +541,6 @@ multiplicative_expression
} }
} }
| multiplicative_expression SLASH unary_expression { | multiplicative_expression SLASH unary_expression {
FRAG_VERT_ONLY("/", @2);
$$ = context->intermediate.addBinaryMath(EOpDiv, $1, $3, @2); $$ = context->intermediate.addBinaryMath(EOpDiv, $1, $3, @2);
if ($$ == 0) { if ($$ == 0) {
context->binaryOpError(@2, "/", $1->getCompleteString(), $3->getCompleteString()); context->binaryOpError(@2, "/", $1->getCompleteString(), $3->getCompleteString());
...@@ -739,11 +729,11 @@ assignment_expression ...@@ -739,11 +729,11 @@ assignment_expression
; ;
assignment_operator assignment_operator
: EQUAL { $$.op = EOpAssign; } : EQUAL { $$.op = EOpAssign; }
| MUL_ASSIGN { FRAG_VERT_ONLY("*=", @1); $$.op = EOpMulAssign; } | MUL_ASSIGN { $$.op = EOpMulAssign; }
| DIV_ASSIGN { FRAG_VERT_ONLY("/=", @1); $$.op = EOpDivAssign; } | DIV_ASSIGN { $$.op = EOpDivAssign; }
| ADD_ASSIGN { $$.op = EOpAddAssign; } | ADD_ASSIGN { $$.op = EOpAddAssign; }
| SUB_ASSIGN { $$.op = EOpSubAssign; } | SUB_ASSIGN { $$.op = EOpSubAssign; }
; ;
expression expression
...@@ -1089,76 +1079,8 @@ single_declaration ...@@ -1089,76 +1079,8 @@ single_declaration
$$.intermAggregate = context->intermediate.makeAggregate(symbol, @2); $$.intermAggregate = context->intermediate.makeAggregate(symbol, @2);
} }
} }
//
// Place holder for the pack/unpack languages.
//
// | buffer_specifier {
// $$.intermAggregate = 0;
// }
; ;
// Grammar Note: No 'enum', or 'typedef'.
//
// Place holder for the pack/unpack languages.
//
//%type <interm> buffer_declaration
//%type <interm.type> buffer_specifier input_or_output buffer_declaration_list
//buffer_specifier
// : input_or_output LEFT_BRACE buffer_declaration_list RIGHT_BRACE {
// }
// ;
//
//input_or_output
// : INPUT {
// if (context->globalErrorCheck(@1, context->symbolTable.atGlobalLevel(), "input"))
// context->recover();
// UNPACK_ONLY("input", @1);
// $$.qualifier = EvqInput;
// }
// | OUTPUT {
// if (context->globalErrorCheck(@1, context->symbolTable.atGlobalLevel(), "output"))
// context->recover();
// PACK_ONLY("output", @1);
// $$.qualifier = EvqOutput;
// }
// ;
//
// Place holder for the pack/unpack languages.
//
//buffer_declaration_list
// : buffer_declaration {
// }
// | buffer_declaration_list buffer_declaration {
// }
// ;
//
// Input/output semantics:
// float must be 16 or 32 bits
// float alignment restrictions?
// check for only one input and only one output
// sum of bitfields has to be multiple of 32
//
//
// Place holder for the pack/unpack languages.
//
//buffer_declaration
// : type_specifier IDENTIFIER COLON constant_expression SEMICOLON {
// if (context->reservedErrorCheck(@2, *$2.string, context))
// context->recover();
// $$.variable = new TVariable($2.string, $1);
// if (! context->symbolTable.declare(*$$.variable)) {
// context->error(@2, "redefinition", $$.variable->getName().c_str());
// context->recover();
// // don't have to delete $$.variable, the pool pop will take care of it
// }
// }
// ;
fully_specified_type fully_specified_type
: type_specifier { : type_specifier {
$$ = $1; $$ = $1;
...@@ -1465,19 +1387,16 @@ type_specifier_nonarray ...@@ -1465,19 +1387,16 @@ type_specifier_nonarray
$$.setAggregate(4); $$.setAggregate(4);
} }
| MATRIX2 { | MATRIX2 {
FRAG_VERT_ONLY("mat2", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtFloat, qual, @1); $$.setBasic(EbtFloat, qual, @1);
$$.setMatrix(2, 2); $$.setMatrix(2, 2);
} }
| MATRIX3 { | MATRIX3 {
FRAG_VERT_ONLY("mat3", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtFloat, qual, @1); $$.setBasic(EbtFloat, qual, @1);
$$.setMatrix(3, 3); $$.setMatrix(3, 3);
} }
| MATRIX4 { | MATRIX4 {
FRAG_VERT_ONLY("mat4", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtFloat, qual, @1); $$.setBasic(EbtFloat, qual, @1);
$$.setMatrix(4, 4); $$.setMatrix(4, 4);
...@@ -1513,7 +1432,6 @@ type_specifier_nonarray ...@@ -1513,7 +1432,6 @@ type_specifier_nonarray
$$.setMatrix(4, 3); $$.setMatrix(4, 3);
} }
| SAMPLER2D { | SAMPLER2D {
FRAG_VERT_ONLY("sampler2D", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtSampler2D, qual, @1); $$.setBasic(EbtSampler2D, qual, @1);
} }
...@@ -1522,7 +1440,6 @@ type_specifier_nonarray ...@@ -1522,7 +1440,6 @@ type_specifier_nonarray
$$.setBasic(EbtSampler3D, qual, @1); $$.setBasic(EbtSampler3D, qual, @1);
} }
| SAMPLERCUBE { | SAMPLERCUBE {
FRAG_VERT_ONLY("samplerCube", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtSamplerCube, qual, @1); $$.setBasic(EbtSamplerCube, qual, @1);
} }
...@@ -1567,7 +1484,6 @@ type_specifier_nonarray ...@@ -1567,7 +1484,6 @@ type_specifier_nonarray
context->error(@1, "unsupported type", "samplerExternalOES"); context->error(@1, "unsupported type", "samplerExternalOES");
context->recover(); context->recover();
} }
FRAG_VERT_ONLY("samplerExternalOES", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtSamplerExternalOES, qual, @1); $$.setBasic(EbtSamplerExternalOES, qual, @1);
} }
...@@ -1576,12 +1492,10 @@ type_specifier_nonarray ...@@ -1576,12 +1492,10 @@ type_specifier_nonarray
context->error(@1, "unsupported type", "sampler2DRect"); context->error(@1, "unsupported type", "sampler2DRect");
context->recover(); context->recover();
} }
FRAG_VERT_ONLY("sampler2DRect", @1);
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
$$.setBasic(EbtSampler2DRect, qual, @1); $$.setBasic(EbtSampler2DRect, qual, @1);
} }
| struct_specifier { | struct_specifier {
FRAG_VERT_ONLY("struct", @1);
$$ = $1; $$ = $1;
$$.qualifier = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; $$.qualifier = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
} }
......
src/compiler/glslang_tab.cpp
...@@ -359,14 +359,6 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason) ...@@ -359,14 +359,6 @@ extern void yyerror(YYLTYPE* yylloc, TParseContext* context, const char* reason)
} \ } \
} while (0) } while (0)
#define FRAG_VERT_ONLY(S, L) { \
if (context->shaderType != SH_FRAGMENT_SHADER && \
context->shaderType != SH_VERTEX_SHADER) { \
context->error(L, " supported in vertex/fragment shaders only ", S); \
context->recover(); \
} \
}
#define VERTEX_ONLY(S, L) { \ #define VERTEX_ONLY(S, L) { \
if (context->shaderType != SH_VERTEX_SHADER) { \ if (context->shaderType != SH_VERTEX_SHADER) { \
context->error(L, " supported in vertex shaders only ", S); \ context->error(L, " supported in vertex shaders only ", S); \
...@@ -789,31 +781,31 @@ static const yytype_int16 yyrhs[] = ...@@ -789,31 +781,31 @@ static const yytype_int16 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 213, 213, 214, 217, 252, 255, 260, 265, 270, 0, 205, 205, 206, 209, 244, 247, 252, 257, 262,
275, 281, 284, 287, 290, 293, 303, 316, 324, 424, 267, 273, 276, 279, 282, 285, 295, 308, 316, 416,
427, 435, 438, 444, 448, 455, 461, 470, 478, 481, 419, 427, 430, 436, 440, 447, 453, 462, 470, 473,
491, 494, 504, 514, 535, 536, 537, 542, 543, 552, 483, 486, 496, 506, 527, 528, 529, 534, 535, 543,
564, 565, 573, 584, 588, 589, 599, 609, 619, 632, 554, 555, 563, 574, 578, 579, 589, 599, 609, 622,
633, 643, 656, 660, 664, 668, 669, 682, 683, 696, 623, 633, 646, 650, 654, 658, 659, 672, 673, 686,
697, 710, 711, 728, 729, 742, 743, 744, 745, 746, 687, 700, 701, 718, 719, 732, 733, 734, 735, 736,
750, 753, 764, 772, 780, 807, 812, 823, 827, 831, 740, 743, 754, 762, 770, 797, 802, 813, 817, 821,
835, 842, 879, 882, 889, 897, 918, 939, 949, 977, 825, 832, 869, 872, 879, 887, 908, 929, 939, 967,
982, 992, 997, 1007, 1010, 1013, 1016, 1022, 1029, 1032, 972, 982, 987, 997, 1000, 1003, 1006, 1012, 1019, 1022,
1036, 1040, 1044, 1051, 1055, 1059, 1066, 1070, 1074, 1163, 1026, 1030, 1034, 1041, 1045, 1049, 1056, 1060, 1064, 1085,
1172, 1178, 1181, 1187, 1193, 1200, 1209, 1218, 1221, 1257, 1094, 1100, 1103, 1109, 1115, 1122, 1131, 1140, 1143, 1179,
1264, 1268, 1275, 1278, 1282, 1286, 1295, 1304, 1312, 1322, 1186, 1190, 1197, 1200, 1204, 1208, 1217, 1226, 1234, 1244,
1329, 1332, 1335, 1341, 1348, 1351, 1357, 1360, 1363, 1369, 1251, 1254, 1257, 1263, 1270, 1273, 1279, 1282, 1285, 1291,
1372, 1387, 1391, 1395, 1399, 1403, 1407, 1412, 1417, 1422, 1294, 1309, 1313, 1317, 1321, 1325, 1329, 1334, 1339, 1344,
1427, 1432, 1437, 1442, 1447, 1452, 1457, 1462, 1467, 1473, 1349, 1354, 1359, 1364, 1369, 1374, 1379, 1384, 1389, 1394,
1479, 1485, 1490, 1495, 1500, 1505, 1510, 1515, 1520, 1524, 1399, 1404, 1409, 1414, 1419, 1424, 1429, 1434, 1438, 1442,
1529, 1533, 1537, 1541, 1545, 1549, 1553, 1557, 1561, 1565, 1446, 1450, 1454, 1458, 1462, 1466, 1470, 1474, 1478, 1482,
1574, 1583, 1588, 1601, 1601, 1604, 1604, 1610, 1613, 1628, 1490, 1498, 1502, 1515, 1515, 1518, 1518, 1524, 1527, 1542,
1631, 1640, 1644, 1650, 1657, 1672, 1676, 1680, 1681, 1687, 1545, 1554, 1558, 1564, 1571, 1586, 1590, 1594, 1595, 1601,
1688, 1689, 1690, 1691, 1695, 1696, 1696, 1696, 1706, 1707, 1602, 1603, 1604, 1605, 1609, 1610, 1610, 1610, 1620, 1621,
1711, 1711, 1712, 1712, 1717, 1720, 1730, 1733, 1739, 1740, 1625, 1625, 1626, 1626, 1631, 1634, 1644, 1647, 1653, 1654,
1744, 1752, 1756, 1766, 1771, 1788, 1788, 1793, 1793, 1800, 1658, 1666, 1670, 1680, 1685, 1702, 1702, 1707, 1707, 1714,
1800, 1808, 1811, 1817, 1820, 1826, 1830, 1837, 1844, 1851, 1714, 1722, 1725, 1731, 1734, 1740, 1744, 1751, 1758, 1765,
1858, 1869, 1878, 1882, 1889, 1892, 1898, 1898 1772, 1783, 1792, 1796, 1803, 1806, 1812, 1812
}; };
#endif #endif
...@@ -2951,7 +2943,6 @@ yyreduce: ...@@ -2951,7 +2943,6 @@ yyreduce:
case 38: case 38:
{ {
FRAG_VERT_ONLY("*", (yylsp[(2) - (3)]));
(yyval.interm.intermTypedNode) = context->intermediate.addBinaryMath(EOpMul, (yyvsp[(1) - (3)].interm.intermTypedNode), (yyvsp[(3) - (3)].interm.intermTypedNode), (yylsp[(2) - (3)])); (yyval.interm.intermTypedNode) = context->intermediate.addBinaryMath(EOpMul, (yyvsp[(1) - (3)].interm.intermTypedNode), (yyvsp[(3) - (3)].interm.intermTypedNode), (yylsp[(2) - (3)]));
if ((yyval.interm.intermTypedNode) == 0) { if ((yyval.interm.intermTypedNode) == 0) {
context->binaryOpError((yylsp[(2) - (3)]), "*", (yyvsp[(1) - (3)].interm.intermTypedNode)->getCompleteString(), (yyvsp[(3) - (3)].interm.intermTypedNode)->getCompleteString()); context->binaryOpError((yylsp[(2) - (3)]), "*", (yyvsp[(1) - (3)].interm.intermTypedNode)->getCompleteString(), (yyvsp[(3) - (3)].interm.intermTypedNode)->getCompleteString());
...@@ -2964,7 +2955,6 @@ yyreduce: ...@@ -2964,7 +2955,6 @@ yyreduce:
case 39: case 39:
{ {
FRAG_VERT_ONLY("/", (yylsp[(2) - (3)]));
(yyval.interm.intermTypedNode) = context->intermediate.addBinaryMath(EOpDiv, (yyvsp[(1) - (3)].interm.intermTypedNode), (yyvsp[(3) - (3)].interm.intermTypedNode), (yylsp[(2) - (3)])); (yyval.interm.intermTypedNode) = context->intermediate.addBinaryMath(EOpDiv, (yyvsp[(1) - (3)].interm.intermTypedNode), (yyvsp[(3) - (3)].interm.intermTypedNode), (yylsp[(2) - (3)]));
if ((yyval.interm.intermTypedNode) == 0) { if ((yyval.interm.intermTypedNode) == 0) {
context->binaryOpError((yylsp[(2) - (3)]), "/", (yyvsp[(1) - (3)].interm.intermTypedNode)->getCompleteString(), (yyvsp[(3) - (3)].interm.intermTypedNode)->getCompleteString()); context->binaryOpError((yylsp[(2) - (3)]), "/", (yyvsp[(1) - (3)].interm.intermTypedNode)->getCompleteString(), (yyvsp[(3) - (3)].interm.intermTypedNode)->getCompleteString());
...@@ -3218,27 +3208,27 @@ yyreduce: ...@@ -3218,27 +3208,27 @@ yyreduce:
case 65: case 65:
{ (yyval.interm).op = EOpAssign; } { (yyval.interm).op = EOpAssign; }
break; break;
case 66: case 66:
{ FRAG_VERT_ONLY("*=", (yylsp[(1) - (1)])); (yyval.interm).op = EOpMulAssign; } { (yyval.interm).op = EOpMulAssign; }
break; break;
case 67: case 67:
{ FRAG_VERT_ONLY("/=", (yylsp[(1) - (1)])); (yyval.interm).op = EOpDivAssign; } { (yyval.interm).op = EOpDivAssign; }
break; break;
case 68: case 68:
{ (yyval.interm).op = EOpAddAssign; } { (yyval.interm).op = EOpAddAssign; }
break; break;
case 69: case 69:
{ (yyval.interm).op = EOpSubAssign; } { (yyval.interm).op = EOpSubAssign; }
break; break;
case 70: case 70:
...@@ -4157,7 +4147,6 @@ yyreduce: ...@@ -4157,7 +4147,6 @@ yyreduce:
case 158: case 158:
{ {
FRAG_VERT_ONLY("mat2", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[(1) - (1)]));
(yyval.interm.type).setMatrix(2, 2); (yyval.interm.type).setMatrix(2, 2);
...@@ -4167,7 +4156,6 @@ yyreduce: ...@@ -4167,7 +4156,6 @@ yyreduce:
case 159: case 159:
{ {
FRAG_VERT_ONLY("mat3", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[(1) - (1)]));
(yyval.interm.type).setMatrix(3, 3); (yyval.interm.type).setMatrix(3, 3);
...@@ -4177,7 +4165,6 @@ yyreduce: ...@@ -4177,7 +4165,6 @@ yyreduce:
case 160: case 160:
{ {
FRAG_VERT_ONLY("mat4", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtFloat, qual, (yylsp[(1) - (1)]));
(yyval.interm.type).setMatrix(4, 4); (yyval.interm.type).setMatrix(4, 4);
...@@ -4241,7 +4228,6 @@ yyreduce: ...@@ -4241,7 +4228,6 @@ yyreduce:
case 167: case 167:
{ {
FRAG_VERT_ONLY("sampler2D", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtSampler2D, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtSampler2D, qual, (yylsp[(1) - (1)]));
} }
...@@ -4258,7 +4244,6 @@ yyreduce: ...@@ -4258,7 +4244,6 @@ yyreduce:
case 169: case 169:
{ {
FRAG_VERT_ONLY("samplerCube", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtSamplerCube, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtSamplerCube, qual, (yylsp[(1) - (1)]));
} }
...@@ -4343,7 +4328,6 @@ yyreduce: ...@@ -4343,7 +4328,6 @@ yyreduce:
context->error((yylsp[(1) - (1)]), "unsupported type", "samplerExternalOES"); context->error((yylsp[(1) - (1)]), "unsupported type", "samplerExternalOES");
context->recover(); context->recover();
} }
FRAG_VERT_ONLY("samplerExternalOES", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtSamplerExternalOES, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtSamplerExternalOES, qual, (yylsp[(1) - (1)]));
} }
...@@ -4356,7 +4340,6 @@ yyreduce: ...@@ -4356,7 +4340,6 @@ yyreduce:
context->error((yylsp[(1) - (1)]), "unsupported type", "sampler2DRect"); context->error((yylsp[(1) - (1)]), "unsupported type", "sampler2DRect");
context->recover(); context->recover();
} }
FRAG_VERT_ONLY("sampler2DRect", (yylsp[(1) - (1)]));
TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; TQualifier qual = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
(yyval.interm.type).setBasic(EbtSampler2DRect, qual, (yylsp[(1) - (1)])); (yyval.interm.type).setBasic(EbtSampler2DRect, qual, (yylsp[(1) - (1)]));
} }
...@@ -4365,7 +4348,6 @@ yyreduce: ...@@ -4365,7 +4348,6 @@ yyreduce:
case 181: case 181:
{ {
FRAG_VERT_ONLY("struct", (yylsp[(1) - (1)]));
(yyval.interm.type) = (yyvsp[(1) - (1)].interm.type); (yyval.interm.type) = (yyvsp[(1) - (1)].interm.type);
(yyval.interm.type).qualifier = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary; (yyval.interm.type).qualifier = context->symbolTable.atGlobalLevel() ? EvqGlobal : EvqTemporary;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment