Upstream various build fixes from WebKit to ANGLE to make updating ANGLE in WebKit easier.
a) http://trac.webkit.org/changeset/127747
b) http://trac.webkit.org/changeset/128539
c) http://trac.webkit.org/changeset/122870 - Specifically, items #3 and #4 in this changeset's commit message.
Review URL: https://codereview.appspot.com/7040045
Author: maxvujovic@gmail.com
------
Upodate preprocessor.vcxproj to reflect changes in r1640.
Review URL: https://codereview.appspot.com/7061044
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1703 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/glslang_tab.cpp b/src/compiler/glslang_tab.cpp
index 046b40f..7c47ec3 100644
--- a/src/compiler/glslang_tab.cpp
+++ b/src/compiler/glslang_tab.cpp
@@ -91,6 +91,9 @@
#include "compiler/ParseHelper.h"
#include "GLSLANG/ShaderLang.h"
+#define YYENABLE_NLS 0
+#define YYLTYPE_IS_TRIVIAL 1
+
#define YYLEX_PARAM context->scanner
@@ -657,27 +660,27 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 165, 165, 200, 203, 216, 221, 226, 232, 235,
- 314, 317, 418, 428, 441, 449, 549, 552, 560, 564,
- 571, 575, 582, 588, 597, 605, 660, 667, 677, 680,
- 690, 700, 721, 722, 723, 728, 729, 738, 750, 751,
- 759, 770, 774, 775, 785, 795, 805, 818, 819, 829,
- 842, 846, 850, 854, 855, 868, 869, 882, 883, 896,
- 897, 914, 915, 928, 929, 930, 931, 932, 936, 939,
- 950, 958, 985, 990, 997, 1035, 1038, 1045, 1053, 1074,
- 1095, 1106, 1135, 1140, 1150, 1155, 1165, 1168, 1171, 1174,
- 1180, 1187, 1190, 1212, 1230, 1254, 1277, 1281, 1299, 1307,
- 1339, 1359, 1448, 1457, 1480, 1483, 1489, 1497, 1505, 1513,
- 1523, 1530, 1533, 1536, 1542, 1545, 1560, 1564, 1568, 1572,
- 1581, 1586, 1591, 1596, 1601, 1606, 1611, 1616, 1621, 1626,
- 1632, 1638, 1644, 1649, 1654, 1663, 1672, 1677, 1690, 1690,
- 1704, 1704, 1713, 1716, 1731, 1767, 1771, 1777, 1785, 1801,
- 1805, 1809, 1810, 1816, 1817, 1818, 1819, 1820, 1824, 1825,
- 1825, 1825, 1835, 1836, 1840, 1840, 1841, 1841, 1846, 1849,
- 1859, 1862, 1868, 1869, 1873, 1881, 1885, 1895, 1900, 1917,
- 1917, 1922, 1922, 1929, 1929, 1937, 1940, 1946, 1949, 1955,
- 1959, 1966, 1973, 1980, 1987, 1998, 2007, 2011, 2018, 2021,
- 2027, 2027
+ 0, 168, 168, 203, 206, 219, 224, 229, 235, 238,
+ 317, 320, 421, 431, 444, 452, 552, 555, 563, 567,
+ 574, 578, 585, 591, 600, 608, 663, 670, 680, 683,
+ 693, 703, 724, 725, 726, 731, 732, 741, 753, 754,
+ 762, 773, 777, 778, 788, 798, 808, 821, 822, 832,
+ 845, 849, 853, 857, 858, 871, 872, 885, 886, 899,
+ 900, 917, 918, 931, 932, 933, 934, 935, 939, 942,
+ 953, 961, 988, 993, 1000, 1038, 1041, 1048, 1056, 1077,
+ 1098, 1109, 1138, 1143, 1153, 1158, 1168, 1171, 1174, 1177,
+ 1183, 1190, 1193, 1215, 1233, 1257, 1280, 1284, 1302, 1310,
+ 1342, 1362, 1451, 1460, 1483, 1486, 1492, 1500, 1508, 1516,
+ 1526, 1533, 1536, 1539, 1545, 1548, 1563, 1567, 1571, 1575,
+ 1584, 1589, 1594, 1599, 1604, 1609, 1614, 1619, 1624, 1629,
+ 1635, 1641, 1647, 1652, 1657, 1666, 1675, 1680, 1693, 1693,
+ 1707, 1707, 1716, 1719, 1734, 1770, 1774, 1780, 1788, 1804,
+ 1808, 1812, 1813, 1819, 1820, 1821, 1822, 1823, 1827, 1828,
+ 1828, 1828, 1838, 1839, 1843, 1843, 1844, 1844, 1849, 1852,
+ 1862, 1865, 1871, 1872, 1876, 1884, 1888, 1898, 1903, 1920,
+ 1920, 1925, 1925, 1932, 1932, 1940, 1943, 1949, 1952, 1958,
+ 1962, 1969, 1976, 1983, 1990, 2001, 2010, 2014, 2021, 2024,
+ 2030, 2030
};
#endif