Changeset 88539 in webkit
- Timestamp:
- Jun 10, 2011 4:32:38 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r88517 r88539 1 2011-06-10 Lucas De Marchi <lucas.demarchi@profusion.mobi> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [CMAKE] Add generic support for building with WebGL 6 https://bugs.webkit.org/show_bug.cgi?id=62376 7 8 Add files that need to be compiled in every port for supporting WebGL. 9 Each port still needs to add its specific files to 10 CMakeLists${PORT}.txt. Therefore we do not enable WebGL in any port 11 yet. 12 13 * Source/CMakeLists.txt: Add files needed to support WebGL. 14 * Source/cmake/OptionsCommon.cmake: Find required OpenGL package. 15 * Source/cmakeconfig.h.cmake: define ENABLE_WEBGL this feature is 16 enabled. 17 1 18 2011-06-09 Lucas De Marchi <lucas.demarchi@profusion.mobi> 2 19 -
trunk/Source/CMakeLists.txt
r83792 r88539 13 13 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore") 14 14 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit") 15 SET(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/ThirdParty") 15 16 SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools") 16 17 SET(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore") -
trunk/Source/WebCore/CMakeLists.txt
r88518 r88539 848 848 html/canvas/ArrayBuffer.cpp 849 849 html/canvas/ArrayBufferView.cpp 850 html/canvas/CanvasContextAttributes.cpp 850 851 html/canvas/CanvasGradient.cpp 851 852 html/canvas/CanvasPattern.cpp … … 1981 1982 ENDIF () 1982 1983 1984 IF (ENABLE_WEBGL) 1985 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 1986 ${OPENGL_INCLUDE_DIR} 1987 ${THIRDPARTY_DIR}/ANGLE/src 1988 ${THIRDPARTY_DIR}/ANGLE/include 1989 ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG 1990 ) 1991 LIST(APPEND WebCore_LIBRARIES 1992 ${OPENGL_gl_LIBRARY} 1993 ) 1994 LIST(APPEND WebCore_SOURCES 1995 ${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp 1996 ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp 1997 ${THIRDPARTY_DIR}/ANGLE/src/compiler/CodeGenGLSL.cpp 1998 ${THIRDPARTY_DIR}/ANGLE/src/compiler/Compiler.cpp 1999 ${THIRDPARTY_DIR}/ANGLE/src/compiler/debug.cpp 2000 ${THIRDPARTY_DIR}/ANGLE/src/compiler/InfoSink.cpp 2001 ${THIRDPARTY_DIR}/ANGLE/src/compiler/Initialize.cpp 2002 ${THIRDPARTY_DIR}/ANGLE/src/compiler/InitializeDll.cpp 2003 ${THIRDPARTY_DIR}/ANGLE/src/compiler/Intermediate.cpp 2004 ${THIRDPARTY_DIR}/ANGLE/src/compiler/intermOut.cpp 2005 ${THIRDPARTY_DIR}/ANGLE/src/compiler/IntermTraverse.cpp 2006 ${THIRDPARTY_DIR}/ANGLE/src/compiler/ossource_posix.cpp 2007 ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputGLSL.cpp 2008 ${THIRDPARTY_DIR}/ANGLE/src/compiler/OutputHLSL.cpp 2009 ${THIRDPARTY_DIR}/ANGLE/src/compiler/parseConst.cpp 2010 ${THIRDPARTY_DIR}/ANGLE/src/compiler/ParseHelper.cpp 2011 ${THIRDPARTY_DIR}/ANGLE/src/compiler/PoolAlloc.cpp 2012 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor 2013 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/atom.c 2014 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/cpp.c 2015 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/cppstruct.c 2016 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/memory.c 2017 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/scanner.c 2018 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/symbols.c 2019 ${THIRDPARTY_DIR}/ANGLE/src/compiler/preprocessor/tokens.c 2020 ${THIRDPARTY_DIR}/ANGLE/src/compiler/QualifierAlive.cpp 2021 ${THIRDPARTY_DIR}/ANGLE/src/compiler/RemoveTree.cpp 2022 ${THIRDPARTY_DIR}/ANGLE/src/compiler/SearchSymbol.cpp 2023 ${THIRDPARTY_DIR}/ANGLE/src/compiler/ShaderLang.cpp 2024 ${THIRDPARTY_DIR}/ANGLE/src/compiler/SymbolTable.cpp 2025 ${THIRDPARTY_DIR}/ANGLE/src/compiler/VersionGLSL.cpp 2026 ${THIRDPARTY_DIR}/ANGLE/src/compiler/TranslatorGLSL.cpp 2027 ${THIRDPARTY_DIR}/ANGLE/src/compiler/TranslatorHLSL.cpp 2028 ${THIRDPARTY_DIR}/ANGLE/src/compiler/UnfoldSelect.cpp 2029 ${THIRDPARTY_DIR}/ANGLE/src/compiler/util.cpp 2030 ${THIRDPARTY_DIR}/ANGLE/src/compiler/ValidateLimitations.cpp 2031 ${THIRDPARTY_DIR}/ANGLE/src/compiler/VariableInfo.cpp 2032 2033 bindings/js/JSWebGLRenderingContextCustom.cpp 2034 2035 html/canvas/WebGLBuffer.cpp 2036 html/canvas/WebGLContextAttributes.cpp 2037 html/canvas/WebGLContextEvent.cpp 2038 html/canvas/WebGLFramebuffer.cpp 2039 html/canvas/WebGLGetInfo.cpp 2040 html/canvas/WebGLObject.cpp 2041 html/canvas/WebGLProgram.cpp 2042 html/canvas/WebGLRenderbuffer.cpp 2043 html/canvas/WebGLRenderingContext.cpp 2044 html/canvas/WebGLShader.cpp 2045 html/canvas/WebGLTexture.cpp 2046 html/canvas/WebGLUniformLocation.cpp 2047 html/canvas/WebGLVertexArrayObjectOES.cpp 2048 html/canvas/WebGLExtension.cpp 2049 html/canvas/OESStandardDerivatives.cpp 2050 html/canvas/OESTextureFloat.cpp 2051 html/canvas/OESVertexArrayObject.cpp 2052 html/canvas/WebKitLoseContext.cpp 2053 2054 platform/graphics/ANGLEWebKitBridge.cpp 2055 platform/graphics/gpu/DrawingBuffer.cpp 2056 platform/graphics/GraphicsContext3D.cpp 2057 platform/graphics/opengl/Extensions3DOpenGL.cpp 2058 platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2059 ) 2060 ENDIF () 2061 1983 2062 # Modules that the bindings generator scripts may use 1984 2063 SET(SCRIPTS_BINDINGS … … 1995 2074 INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt) 1996 2075 2076 # ANGLE tokenizer & parser 2077 ADD_CUSTOM_COMMAND( 2078 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/glslang.cpp 2079 MAIN_DEPENDENCY ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.l 2080 COMMAND ${FLEX_EXECUTABLE} --noline --nounistd --outfile=glslang.cpp ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.l 2081 WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR} 2082 VERBATIM) 2083 2084 ADD_CUSTOM_COMMAND( 2085 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/glslang_tab.h 2086 MAIN_DEPENDENCY ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.y 2087 COMMAND ${BISON_EXECUTABLE} --no-lines --defines=glslang_tab.h --skeleton=yacc.c --output=glslang_tab.cpp ${THIRDPARTY_DIR}/ANGLE/src/compiler/glslang.y 2088 WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR} 2089 VERBATIM) 1997 2090 1998 2091 # All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm -
trunk/Source/WebCore/ChangeLog
r88536 r88539 1 2011-06-10 Lucas De Marchi <lucas.demarchi@profusion.mobi> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 [CMAKE] Add generic support for building with WebGL 6 https://bugs.webkit.org/show_bug.cgi?id=62376 7 8 Set new THIRDPARTY_DIR variable to compile sources under ThirdParty. 9 10 No change in functionality so no new tests. 11 12 * CMakeLists.txt: 13 1 14 2011-06-10 Ryuan Choi <ryuan.choi@samsung.com> 2 15 -
trunk/Source/cmake/OptionsCommon.cmake
r87061 r88539 11 11 SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++") 12 12 ENDIF () 13 14 IF (ENABLE_WEBGL) 15 FIND_PACKAGE(OpenGL REQUIRED) 16 ENDIF () -
trunk/Source/cmakeconfig.h.cmake
r88517 r88539 38 38 #cmakedefine01 ENABLE_TOUCH_EVENTS 39 39 #cmakedefine01 ENABLE_VIDEO 40 #cmakedefine01 ENABLE_WEBGL 40 41 #cmakedefine01 ENABLE_WEB_SOCKETS 41 42 #cmakedefine01 ENABLE_WORKERS
Note: See TracChangeset
for help on using the changeset viewer.