[webkit-changes] [144490] trunk/Source/ThirdParty/ANGLE

Fri, 01 Mar 2013 13:16:13 -0800

Title: [144490] trunk/Source/ThirdParty/ANGLE
Revision
144490
Author
[email protected]
Date
2013-03-01 13:18:12 -0800 (Fri, 01 Mar 2013)

Log Message

[GTK] Add ANGLE to the GTK+ gyp build
https://bugs.webkit.org/show_bug.cgi?id=111128

Patch by Martin Robinson <[email protected]> on 2013-03-01
Reviewed by Dirk Pranke.

Add files that build an ANGLE static library for GTK+ using gyp.

* ANGLE.gyp/ANGLE.gyp: Added.
* ANGLE.gypi: Added.

Modified Paths

Added Paths

Diff

Added: trunk/Source/ThirdParty/ANGLE/ANGLE.gyp/ANGLE.gyp (0 => 144490)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.gyp/ANGLE.gyp	                        (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.gyp/ANGLE.gyp	2013-03-01 21:18:12 UTC (rev 144490)
@@ -0,0 +1,55 @@
+{
+  'includes': {
+    '../ANGLE.gypi',
+  },
+
+  'variables': {
+    'ANGLE': '..',
+    'FLEX%': 'flex',
+    'BISON%': 'bison',
+  },
+
+  'targets': [
+    {
+      'target_name': 'angle',
+      'type': 'static_library',
+      'sources': [ '<@(angle_files)', ],
+      'include_dirs': [ '<@(angle_include_dirs)' ],
+      'direct_dependent_settings': {
+        'include_dirs': [ '<@(angle_include_dirs)' ],
+      },
+      'actions': [
+        {
+          'action_name': 'GenerateGLShaderLanguageLexer',
+          'inputs': [ '<(ANGLE)/src/compiler/glslang.l' ],
+          'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang.cpp', ],
+          'action': [
+            '<(FLEX)',
+            '--noline',
+            '--nounistd',
+            '--outfile=<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang.cpp',
+            '<(_inputs)',
+          ],
+          'message': 'Generating OpenGL shader language lexer',
+        },
+        {
+          'action_name': 'GenerateGLShaderLanguageParser',
+          'inputs': [ '<(ANGLE)/src/compiler/glslang.y' ],
+          'outputs': [ 
+            '<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang_tab.cpp',
+            '<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang_tab.h',
+          ],
+          'action': [
+            '<(BISON)',
+            '--no-lines',
+            '--defines=<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang_tab.h',
+            '--skeleton=yacc.c',
+            '--output=<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang_tab.cpp',
+            '<(_inputs)',
+          ],
+          'message': 'Generating OpenGL shader language parser',
+        },
+      ]
+    },
+  ],
+}

Added: trunk/Source/ThirdParty/ANGLE/ANGLE.gypi (0 => 144490)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.gypi	                        (rev 0)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.gypi	2013-03-01 21:18:12 UTC (rev 144490)
@@ -0,0 +1,146 @@
+{
+  'variables': {
+    'angle_derived_source_files': [
+      '<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang_tab.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/ANGLE/glslang_tab.h',
+    ],
+    'angle_files': [
+      'include/EGL/egl.h',
+      'include/EGL/eglplatform.h',
+      'include/GLSLANG/ShaderLang.h',
+      'include/KHR/khrplatform.h',
+      'src/common/angleutils.h',
+      'src/compiler/BaseTypes.h',
+      'src/compiler/BuiltInFunctionEmulator.cpp',
+      'src/compiler/BuiltInFunctionEmulator.h',
+      'src/compiler/CodeGenGLSL.cpp',
+      'src/compiler/Common.h',
+      'src/compiler/Compiler.cpp',
+      'src/compiler/ConstantUnion.h',
+      'src/compiler/debug.cpp',
+      'src/compiler/debug.h',
+      'src/compiler/depgraph/DependencyGraph.cpp',
+      'src/compiler/depgraph/DependencyGraph.h',
+      'src/compiler/depgraph/DependencyGraphBuilder.h',
+      'src/compiler/depgraph/DependencyGraphBuilder.cpp',
+      'src/compiler/depgraph/DependencyGraphOutput.h',
+      'src/compiler/depgraph/DependencyGraphOutput.cpp',
+      'src/compiler/depgraph/DependencyGraphTraverse.cpp',
+      'src/compiler/DetectDiscontinuity.cpp',
+      'src/compiler/DetectDiscontinuity.h',
+      'src/compiler/DetectRecursion.cpp',
+      'src/compiler/DetectRecursion.h',
+      'src/compiler/Diagnostics.cpp',
+      'src/compiler/Diagnostics.h',
+      'src/compiler/DirectiveHandler.cpp',
+      'src/compiler/DirectiveHandler.h',
+      'src/compiler/ExtensionBehavior.h',
+      'src/compiler/ForLoopUnroll.cpp',
+      'src/compiler/ForLoopUnroll.h',
+      'src/compiler/glslang.h',
+      'src/compiler/HashNames.h',
+      'src/compiler/InfoSink.cpp',
+      'src/compiler/InfoSink.h',
+      'src/compiler/Initialize.cpp',
+      'src/compiler/InitializeDll.cpp',
+      'src/compiler/InitializeDll.h',
+      'src/compiler/InitializeGlobals.h',
+      'src/compiler/Initialize.h',
+      'src/compiler/InitializeParseContext.h',
+      'src/compiler/InitializeParseContext.cpp',
+      'src/compiler/Intermediate.cpp',
+      'src/compiler/intermediate.h',
+      'src/compiler/intermOut.cpp',
+      'src/compiler/IntermTraverse.cpp',
+      'src/compiler/localintermediate.h',
+      'src/compiler/MapLongVariableNames.cpp',
+      'src/compiler/MapLongVariableNames.h',
+      'src/compiler/MMap.h',
+      'src/compiler/osinclude.h',
+      'src/compiler/ossource_posix.cpp',
+      'src/compiler/OutputESSL.cpp',
+      'src/compiler/OutputESSL.h',
+      'src/compiler/OutputGLSL.cpp',
+      'src/compiler/OutputGLSL.h',
+      'src/compiler/OutputGLSLBase.cpp',
+      'src/compiler/OutputGLSLBase.h',
+      'src/compiler/OutputHLSL.cpp',
+      'src/compiler/OutputHLSL.h',
+      'src/compiler/parseConst.cpp',
+      'src/compiler/ParseHelper.cpp',
+      'src/compiler/ParseHelper.h',
+      'src/compiler/PoolAlloc.cpp',
+      'src/compiler/PoolAlloc.h',
+      'src/compiler/Pragma.h',
+      'src/compiler/preprocessor/length_limits.h',
+      'src/compiler/preprocessor/numeric_lex.h',
+      'src/compiler/preprocessor/DiagnosticsBase.cpp',
+      'src/compiler/preprocessor/DiagnosticsBase.h',
+      'src/compiler/preprocessor/DirectiveHandlerBase.cpp',
+      'src/compiler/preprocessor/DirectiveHandlerBase.h',
+      'src/compiler/preprocessor/DirectiveParser.cpp',
+      'src/compiler/preprocessor/DirectiveParser.h',
+      'src/compiler/preprocessor/ExpressionParser.cpp',
+      'src/compiler/preprocessor/ExpressionParser.h',
+      'src/compiler/preprocessor/Input.cpp',
+      'src/compiler/preprocessor/Input.h',
+      'src/compiler/preprocessor/Lexer.cpp',
+      'src/compiler/preprocessor/Lexer.h',
+      'src/compiler/preprocessor/Macro.cpp',
+      'src/compiler/preprocessor/Macro.h',
+      'src/compiler/preprocessor/MacroExpander.cpp',
+      'src/compiler/preprocessor/MacroExpander.h',
+      'src/compiler/preprocessor/Preprocessor.cpp',
+      'src/compiler/preprocessor/Preprocessor.h',
+      'src/compiler/preprocessor/SourceLocation.h',
+      'src/compiler/preprocessor/Token.cpp',
+      'src/compiler/preprocessor/Token.h',
+      'src/compiler/preprocessor/Tokenizer.cpp',
+      'src/compiler/preprocessor/Tokenizer.h',
+      'src/compiler/preprocessor/pp_utils.h',
+      'src/compiler/QualifierAlive.cpp',
+      'src/compiler/QualifierAlive.h',
+      'src/compiler/RemoveTree.cpp',
+      'src/compiler/RemoveTree.h',
+      'src/compiler/RenameFunction.h',
+      'src/compiler/SearchSymbol.cpp',
+      'src/compiler/SearchSymbol.h',
+      'src/compiler/ShaderLang.cpp',
+      'src/compiler/ShHandle.h',
+      'src/compiler/SymbolTable.cpp',
+      'src/compiler/SymbolTable.h',
+      'src/compiler/VariablePacker.cpp',
+      'src/compiler/VariablePacker.h',
+      'src/compiler/VersionGLSL.cpp',
+      'src/compiler/VersionGLSL.h',
+      'src/compiler/timing/RestrictFragmentShaderTiming.cpp',
+      'src/compiler/timing/RestrictFragmentShaderTiming.h',
+      'src/compiler/timing/RestrictVertexShaderTiming.cpp',
+      'src/compiler/timing/RestrictVertexShaderTiming.h',
+      'src/compiler/TranslatorESSL.cpp',
+      'src/compiler/TranslatorESSL.h',
+      'src/compiler/TranslatorGLSL.cpp',
+      'src/compiler/TranslatorGLSL.h',
+      'src/compiler/TranslatorHLSL.cpp',
+      'src/compiler/TranslatorHLSL.h',
+      'src/compiler/Types.h',
+      'src/compiler/UnfoldShortCircuit.cpp',
+      'src/compiler/UnfoldShortCircuit.h',
+      'src/compiler/util.cpp',
+      'src/compiler/util.h',
+      'src/compiler/ValidateLimitations.cpp',
+      'src/compiler/ValidateLimitations.h',
+      'src/compiler/VariableInfo.cpp',
+      'src/compiler/VariableInfo.h',
+      'src/third_party/compiler/ArrayBoundsClamper.cpp',
+      'src/third_party/compiler/ArrayBoundsClamper.h',
+    ],
+    'angle_include_dirs': [
+      'src',
+      'include',
+      'include/GLSLANG',
+      'include/KHR',
+    ],
+  }
+}

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (144489 => 144490)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-03-01 21:14:24 UTC (rev 144489)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2013-03-01 21:18:12 UTC (rev 144490)
@@ -1,3 +1,15 @@
+2013-03-01  Martin Robinson  <[email protected]>
+
+        [GTK] Add ANGLE to the GTK+ gyp build
+        https://bugs.webkit.org/show_bug.cgi?id=111128
+
+        Reviewed by Dirk Pranke.
+
+        Add files that build an ANGLE static library for GTK+ using gyp.
+
+        * ANGLE.gyp/ANGLE.gyp: Added.
+        * ANGLE.gypi: Added.
+
 2013-02-22  Kenneth Russell  <[email protected]>
 
         Mac OS build broken by new ExpressionParser.cpp

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to