Changeset 159542 in webkit

Timestamp:

Nov 19, 2013, 9:04:57 PM (12 years ago)

Author:

Martin Robinson

Message:

Fix the GTK+ build after the ANGLE update in r159533

• GNUmakefile.am: Update the source list.

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (9 diffs)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2013-11-19  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix the GTK+ build after the ANGLE update in r159533
+
+        * GNUmakefile.am: Update the source list.
+
 2013-11-19  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/ThirdParty/ANGLE/GNUmakefile.am

@@ -38 +38 @@
         Source/ThirdParty/ANGLE/src/compiler/debug.cpp \
         Source/ThirdParty/ANGLE/src/compiler/debug.h \
+        Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.h \
         Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.cpp \
         Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraph.h \
-        Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.h \
-        Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphBuilder.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.cpp \
         Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.h \
-        Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphOutput.cpp \
         Source/ThirdParty/ANGLE/src/compiler/depgraph/DependencyGraphTraverse.cpp \
         Source/ThirdParty/ANGLE/src/compiler/DetectCallDepth.cpp \
         Source/ThirdParty/ANGLE/src/compiler/DetectCallDepth.h \
         Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.h \
         Source/ThirdParty/ANGLE/src/compiler/DetectDiscontinuity.h \
         Source/ThirdParty/ANGLE/src/compiler/Diagnostics.cpp \
@@ -69 +70 @@
         Source/ThirdParty/ANGLE/src/compiler/InitializeGLPosition.h \
         Source/ThirdParty/ANGLE/src/compiler/Initialize.h \
+        Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.cpp \
         Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.h \
-        Source/ThirdParty/ANGLE/src/compiler/InitializeParseContext.cpp \
         Source/ThirdParty/ANGLE/src/compiler/Intermediate.cpp \
         Source/ThirdParty/ANGLE/src/compiler/intermediate.h \
@@ -79 +80 @@
         Source/ThirdParty/ANGLE/src/compiler/MapLongVariableNames.h \
         Source/ThirdParty/ANGLE/src/compiler/MMap.h \
-        Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \     
+        Source/ThirdParty/ANGLE/src/compiler/NodeSearch.h \
         Source/ThirdParty/ANGLE/src/compiler/osinclude.h \
         Source/ThirdParty/ANGLE/src/compiler/ossource_posix.cpp \
         Source/ThirdParty/ANGLE/src/compiler/OutputESSL.cpp \
         Source/ThirdParty/ANGLE/src/compiler/OutputESSL.h \
+        Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.h \
         Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.cpp \
         Source/ThirdParty/ANGLE/src/compiler/OutputGLSL.h \
-        Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.cpp \
-        Source/ThirdParty/ANGLE/src/compiler/OutputGLSLBase.h \
         Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.cpp \
         Source/ThirdParty/ANGLE/src/compiler/OutputHLSL.h \
@@ -96 +97 @@
         Source/ThirdParty/ANGLE/src/compiler/PoolAlloc.h \
         Source/ThirdParty/ANGLE/src/compiler/Pragma.h \
-        Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h \
-        Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.cpp \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/DiagnosticsBase.h \
@@ -108 +107 @@
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.cpp \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h \
+        Source/ThirdParty/ANGLE/src/compiler/preprocessor/length_limits.h \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.cpp \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Lexer.h \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.cpp \
-        Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.cpp \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h \
+        Source/ThirdParty/ANGLE/src/compiler/preprocessor/Macro.h \
+        Source/ThirdParty/ANGLE/src/compiler/preprocessor/numeric_lex.h \
+        Source/ThirdParty/ANGLE/src/compiler/preprocessor/pp_utils.h \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.cpp \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Preprocessor.h \
@@ -121 +123 @@
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.cpp \
         Source/ThirdParty/ANGLE/src/compiler/preprocessor/Tokenizer.h \
-        Source/ThirdParty/ANGLE/src/compiler/preprocessor/pp_utils.h \
         Source/ThirdParty/ANGLE/src/compiler/QualifierAlive.cpp \
         Source/ThirdParty/ANGLE/src/compiler/QualifierAlive.h \
@@ -133 +134 @@
         Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp \
         Source/ThirdParty/ANGLE/src/compiler/SymbolTable.h \
-        Source/ThirdParty/ANGLE/src/compiler/Uniform.cpp \
-        Source/ThirdParty/ANGLE/src/compiler/Uniform.h \
-        Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuitAST.cpp \
-        Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuitAST.h \
-        Source/ThirdParty/ANGLE/src/compiler/VariablePacker.cpp \
-        Source/ThirdParty/ANGLE/src/compiler/VariablePacker.h \
-        Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.cpp \
-        Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
         Source/ThirdParty/ANGLE/src/compiler/timing/RestrictFragmentShaderTiming.cpp \
         Source/ThirdParty/ANGLE/src/compiler/timing/RestrictFragmentShaderTiming.h \
@@ -152 +145 @@
         Source/ThirdParty/ANGLE/src/compiler/TranslatorHLSL.h \
         Source/ThirdParty/ANGLE/src/compiler/Types.h \
-        Source/ThirdParty/ANGLE/src/compiler/Uniform.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuitAST.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuitAST.h \
         Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.cpp \
         Source/ThirdParty/ANGLE/src/compiler/UnfoldShortCircuit.h \
+        Source/ThirdParty/ANGLE/src/compiler/Uniform.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/Uniform.h \
         Source/ThirdParty/ANGLE/src/compiler/util.cpp \
         Source/ThirdParty/ANGLE/src/compiler/util.h \
@@ -161 +157 @@
         Source/ThirdParty/ANGLE/src/compiler/VariableInfo.cpp \
         Source/ThirdParty/ANGLE/src/compiler/VariableInfo.h \
+        Source/ThirdParty/ANGLE/src/compiler/VariablePacker.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/VariablePacker.h \
+        Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.cpp \
+        Source/ThirdParty/ANGLE/src/compiler/VersionGLSL.h \
         Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.cpp \
         Source/ThirdParty/ANGLE/src/third_party/compiler/ArrayBoundsClamper.h