Title: [160195] tags/Safari-538.8/Source/ThirdParty/ANGLE
Diff
Modified: tags/Safari-538.8/Source/ThirdParty/ANGLE/ChangeLog (160194 => 160195)
--- tags/Safari-538.8/Source/ThirdParty/ANGLE/ChangeLog 2013-12-05 22:55:38 UTC (rev 160194)
+++ tags/Safari-538.8/Source/ThirdParty/ANGLE/ChangeLog 2013-12-05 23:04:11 UTC (rev 160195)
@@ -1,3 +1,19 @@
+2013-12-05 Matthew Hanson <[email protected]>
+
+ Merge r160194.
+
+ 2013-12-05 Matthew Hanson <[email protected]>
+
+ Fix ANGLE build failures by re-comitting the changes in http://trac.webkit.org/changeset/154223
+ on top of the library updates introduced by http://trac.webkit.org/changeset/159533.
+
+ Rubber-stamped by Babak Shafiei.
+
+ * src/compiler/glslang.l:
+ * src/compiler/glslang_lex.cpp:
+ * src/compiler/preprocessor/Tokenizer.cpp:
+ * src/compiler/preprocessor/Tokenizer.l:
+
2013-12-03 Daniel Bates <[email protected]>
ANGLE fails to build with trunk clang: unused constant kTraceBufferLen
Modified: tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/glslang.l (160194 => 160195)
--- tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/glslang.l 2013-12-05 22:55:38 UTC (rev 160194)
+++ tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/glslang.l 2013-12-05 23:04:11 UTC (rev 160195)
@@ -33,6 +33,12 @@
#pragma warning(disable: 4505)
#pragma warning(disable: 4701)
#endif
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
}
%{
@@ -252,6 +258,10 @@
%%
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
pp::Token token;
yyget_extra(yyscanner)->preprocessor.lex(&token);
Modified: tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp (160194 => 160195)
--- tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp 2013-12-05 22:55:38 UTC (rev 160194)
+++ tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/glslang_lex.cpp 2013-12-05 23:04:11 UTC (rev 160195)
@@ -19,8 +19,14 @@
#pragma warning(disable: 4701)
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
#line 25 "./glslang_lex.cpp"
#define YY_INT_ALIGNED short int
@@ -2861,6 +2867,10 @@
#define YYTABLES_NAME "yytables"
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
pp::Token token;
yyget_extra(yyscanner)->preprocessor.lex(&token);
Modified: tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp (160194 => 160195)
--- tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp 2013-12-05 22:55:38 UTC (rev 160194)
+++ tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp 2013-12-05 23:04:11 UTC (rev 160195)
@@ -529,6 +529,12 @@
#pragma GCC diagnostic ignored "-Wmissing-noreturn"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
typedef std::string YYSTYPE;
typedef pp::SourceLocation YYLTYPE;
@@ -2203,6 +2209,10 @@
#define YYTABLES_NAME "yytables"
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
namespace pp {
Tokenizer::Tokenizer(Diagnostics* diagnostics)
Modified: tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l (160194 => 160195)
--- tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l 2013-12-05 22:55:38 UTC (rev 160194)
+++ tags/Safari-538.8/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.l 2013-12-05 23:04:11 UTC (rev 160195)
@@ -33,6 +33,12 @@
#pragma GCC diagnostic ignored "-Wmissing-noreturn"
#endif
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
typedef std::string YYSTYPE;
typedef pp::SourceLocation YYLTYPE;
@@ -265,6 +271,10 @@
%%
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
namespace pp {
Tokenizer::Tokenizer(Diagnostics* diagnostics)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
