Attachment 96664 Details for Bug 62376 – Patch

[patch] Patch

bug-62376-20110609205525.patch (text/plain), 8.68 KB, created by Lucas De Marchi on 2011-06-09 16:54:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas De Marchi

Created: 2011-06-09 16:54:49 PDT

Size: 8.68 KB

patch

obsolete

>Subversion Revision: 88448
>diff --git a/ChangeLog b/ChangeLog
>index 20a19babb83dcbaf9c679edcc34e12e73dab4939..e911596e6eba382a5278ec41035435c76d151649 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,20 @@
>+2011-06-09  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [CMAKE] Add generic support for building with WebGL
>+        https://bugs.webkit.org/show_bug.cgi?id=62376
>+
>+        Add files that need to be compiled in every port for supporting WebGL.
>+        Each port still needs to add its specific files to
>+        CMakeLists${PORT}.txt. Therefore we do not enable WebGL in any port
>+        yet.
>+
>+        * Source/CMakeLists.txt: Add files needed to support WebGL.
>+        * Source/cmake/OptionsCommon.cmake: Find required OpenGL package.
>+        * Source/cmakeconfig.h.cmake: define ENABLE_WEBGL this feature is
>+        enabled.
>+
> 2011-06-08  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
> 
>         Reviewed by NOBODY (OOPS!).
>diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
>index cdaa55565b4b2a2a552cc4c9ede41ee813024d7b..237e479a986ce798332944e868cba6979e1957a9 100644
>--- a/Source/CMakeLists.txt
>+++ b/Source/CMakeLists.txt
>@@ -12,6 +12,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
> SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
> SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
> SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
>+SET(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/ThirdParty")
> SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools")
> SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
> SET(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index c419f9ec3e3fac6fe848004b88dce40ad5a03d4c..332f6d4b30b0b764caf7c09927f1e2dcb2df07a3 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -807,6 +807,7 @@ SET(WebCore_SOURCES
> 
>     html/canvas/ArrayBuffer.cpp
>     html/canvas/ArrayBufferView.cpp
>+    html/canvas/CanvasContextAttributes.cpp
>     html/canvas/CanvasGradient.cpp
>     html/canvas/CanvasPattern.cpp
>     html/canvas/CanvasPixelArray.cpp
>@@ -2002,6 +2003,84 @@ IF (ENABLE_OFFLINE_WEB_APPLICATIONS)
>     )
> ENDIF ()
> 
>+IF (ENABLE_WEBGL)
>+    LIST(APPEND WebCore_INCLUDE_DIRECTORIES
>+        ${OPENGL_INCLUDE_DIR}
>+        ${THIRDPARTY_DIR}/ANGLE/src
>+        ${THIRDPARTY_DIR}/ANGLE/include
>+        ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
>+    )
>+    LIST(APPEND WebCore_LIBRARIES
>+        ${OPENGL_gl_LIBRARY}
>+    )
>+    LIST(APPEND WebCore_SOURCES
>+        ${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp
>+        ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/CodeGenGLSL.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/Compiler.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/debug.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/InfoSink.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/Initialize.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/InitializeDll.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/Intermediate.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/intermOut.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/IntermTraverse.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_posix.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputGLSL.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputHLSL.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/parseConst.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/ParseHelper.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/PoolAlloc.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/atom.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/cpp.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/cppstruct.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/memory.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/scanner.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/symbols.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/tokens.c
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/QualifierAlive.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/RemoveTree.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/SearchSymbol.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/ShaderLang.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/SymbolTable.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/VersionGLSL.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/TranslatorGLSL.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/TranslatorHLSL.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/UnfoldSelect.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/util.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/ValidateLimitations.cpp
>+        ${THIRDPARTY_DIR}/ANGLE/src/compiler/VariableInfo.cpp
>+
>+        bindings/js/JSWebGLRenderingContextCustom.cpp
>+
>+        html/canvas/WebGLBuffer.cpp
>+        html/canvas/WebGLContextAttributes.cpp
>+        html/canvas/WebGLContextEvent.cpp
>+        html/canvas/WebGLFramebuffer.cpp
>+        html/canvas/WebGLGetInfo.cpp
>+        html/canvas/WebGLObject.cpp
>+        html/canvas/WebGLProgram.cpp
>+        html/canvas/WebGLRenderbuffer.cpp
>+        html/canvas/WebGLRenderingContext.cpp
>+        html/canvas/WebGLShader.cpp
>+        html/canvas/WebGLTexture.cpp
>+        html/canvas/WebGLUniformLocation.cpp
>+        html/canvas/WebGLVertexArrayObjectOES.cpp
>+        html/canvas/WebGLExtension.cpp
>+        html/canvas/OESStandardDerivatives.cpp
>+        html/canvas/OESTextureFloat.cpp
>+        html/canvas/OESVertexArrayObject.cpp
>+        html/canvas/WebKitLoseContext.cpp
>+
>+        platform/graphics/ANGLEWebKitBridge.cpp
>+        platform/graphics/gpu/DrawingBuffer.cpp
>+        platform/graphics/GraphicsContext3D.cpp
>+        platform/graphics/opengl/Extensions3DOpenGL.cpp
>+        platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>+    )
>+ENDIF ()
>+
> # Modules that the bindings generator scripts may use
> SET(SCRIPTS_BINDINGS
>     ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
>@@ -2016,6 +2095,20 @@ SET(WebCore_LIBRARIES ${JavaScriptCore_LIBRARY_NAME})
> SET(WebCore_LINK_FLAGS "")
> INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt)
> 
>+# ANGLE tokenizer & parser
>+ADD_CUSTOM_COMMAND(
>+    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp
>+    MAIN_DEPENDENCY ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.l
>+    COMMAND ${FLEX_EXECUTABLE} --noline --nounistd --outfile=glslang.cpp ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.l
>+    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
>+    VERBATIM)
>+
>+ADD_CUSTOM_COMMAND(
>+    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.h
>+    MAIN_DEPENDENCY ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.y
>+    COMMAND ${BISON_EXECUTABLE} --no-lines --defines=glslang_tab.h --skeleton=yacc.c --output=glslang_tab.cpp ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.y
>+    WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
>+    VERBATIM)
> 
> # All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
> ADD_CUSTOM_COMMAND(
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index b7f75a673cf143b68cb68ac7c86f8071b520afa3..6b041731b01227bad81d94f54fcdc3fe65ab66da 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2011-06-09  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [CMAKE] Add generic support for building with WebGL
>+        https://bugs.webkit.org/show_bug.cgi?id=62376
>+
>+        Set new THIRDPARTY_DIR variable to compile sources under ThirdParty.
>+
>+        No change in functionality so no new tests.
>+
>+        * CMakeLists.txt:
>+
> 2011-06-08  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
> 
>         Reviewed by NOBODY (OOPS!).
>diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
>index 0e2429c980b20b68f7b06ddce0c73af888d1c2c0..27a5e828e18457cb93a4125119f3622bceac79a9 100644
>--- a/Source/cmake/OptionsCommon.cmake
>+++ b/Source/cmake/OptionsCommon.cmake
>@@ -10,3 +10,7 @@ IF (MSVC)
> ELSE ()
>     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
> ENDIF ()
>+
>+IF (ENABLE_WEBGL)
>+    FIND_PACKAGE(OpenGL REQUIRED)
>+ENDIF ()
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index 5132fbaa3c99a70b7a8b9bdef4c506fd732b5ef6..3d7f76a82c03a35a57910f558e0d0a1f55388e01 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -38,6 +38,7 @@
> #cmakedefine01 ENABLE_SVG_USE
> #cmakedefine01 ENABLE_TOUCH_EVENTS
> #cmakedefine01 ENABLE_VIDEO
>+#cmakedefine01 ENABLE_WEBGL
> #cmakedefine01 ENABLE_WEB_SOCKETS
> #cmakedefine01 ENABLE_WORKERS
> #cmakedefine01 ENABLE_XHTMLMP

Actions: View | Formatted Diff | Diff

Attachments on bug 62376: 96589 | 96664