Title: [122958] trunk/Source/WebCore
- Revision
- 122958
- Author
- [email protected]
- Date
- 2012-07-18 06:19:13 -0700 (Wed, 18 Jul 2012)
Log Message
[WK2][EFL] Divide ENABLE(WEBGL) into ENABLE(WEBGL) and USE(3D_GRAPHICS) in CMakeLists.txt
https://bugs.webkit.org/show_bug.cgi?id=91584
Patch by YoungTaeck Song <[email protected]> on 2012-07-18
Reviewed by Noam Rosenthal.
This patch is a subset of Efl's UI_SIDE_COMPOSITING implementation.
Modified CMakeLists.txt so that the basic 3D-graphics sources can be compiled even when WebGL is disabled.
* CMakeLists.txt:
* PlatformEfl.cmake:
* platform/graphics/GraphicsContext3D.h:
(GraphicsContext3D):
* platform/graphics/efl/GraphicsContext3DEfl.cpp:
(WebCore::GraphicsContext3D::platformGraphicsContext3D):
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (122957 => 122958)
--- trunk/Source/WebCore/CMakeLists.txt 2012-07-18 13:11:01 UTC (rev 122957)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-07-18 13:19:13 UTC (rev 122958)
@@ -2310,12 +2310,74 @@
ENDIF ()
IF (ENABLE_WEBGL)
- #ANGLE
+ SET(WTF_USE_3D_GRAPHICS 1)
+ ADD_DEFINITIONS(-DWTF_USE_3D_GRAPHICS=1)
+
+ LIST(APPEND WebCore_SOURCES
+ html/canvas/OESStandardDerivatives.cpp
+ html/canvas/OESTextureFloat.cpp
+ html/canvas/OESVertexArrayObject.cpp
+ html/canvas/WebGLBuffer.cpp
+ html/canvas/WebGLCompressedTextureS3TC.cpp
+ html/canvas/WebGLContextAttributes.cpp
+ html/canvas/WebGLContextEvent.cpp
+ html/canvas/WebGLContextGroup.cpp
+ html/canvas/WebGLContextObject.cpp
+ html/canvas/WebGLDebugRendererInfo.cpp
+ html/canvas/WebGLDebugShaders.cpp
+ html/canvas/WebGLDepthTexture.cpp
+ html/canvas/WebGLFramebuffer.cpp
+ html/canvas/WebGLGetInfo.cpp
+ html/canvas/WebGLLoseContext.cpp
+ html/canvas/WebGLObject.cpp
+ html/canvas/WebGLProgram.cpp
+ html/canvas/WebGLRenderbuffer.cpp
+ html/canvas/WebGLRenderingContext.cpp
+ html/canvas/WebGLShader.cpp
+ html/canvas/WebGLShaderPrecisionFormat.cpp
+ html/canvas/WebGLSharedObject.cpp
+ html/canvas/WebGLTexture.cpp
+ html/canvas/WebGLUniformLocation.cpp
+ html/canvas/WebGLVertexArrayObjectOES.cpp
+ html/canvas/WebGLExtension.cpp
+ html/canvas/EXTTextureFilterAnisotropic.cpp
+ html/canvas/OESStandardDerivatives.cpp
+ html/canvas/OESTextureFloat.cpp
+ html/canvas/OESVertexArrayObject.cpp
+ )
+ LIST(APPEND WebCore_IDL_FILES
+ html/canvas/EXTTextureFilterAnisotropic.idl
+ html/canvas/OESStandardDerivatives.idl
+ html/canvas/OESTextureFloat.idl
+ html/canvas/OESVertexArrayObject.idl
+ html/canvas/WebGLActiveInfo.idl
+ html/canvas/WebGLBuffer.idl
+ html/canvas/WebGLCompressedTextureS3TC.idl
+ html/canvas/WebGLContextAttributes.idl
+ html/canvas/WebGLContextEvent.idl
+ html/canvas/WebGLDebugRendererInfo.idl
+ html/canvas/WebGLDebugShaders.idl
+ html/canvas/WebGLDepthTexture.idl
+ html/canvas/WebGLFramebuffer.idl
+ html/canvas/WebGLLoseContext.idl
+ html/canvas/WebGLProgram.idl
+ html/canvas/WebGLRenderbuffer.idl
+ html/canvas/WebGLRenderingContext.idl
+ html/canvas/WebGLShader.idl
+ html/canvas/WebGLShaderPrecisionFormat.idl
+ html/canvas/WebGLTexture.idl
+ html/canvas/WebGLUniformLocation.idl
+ html/canvas/WebGLVertexArrayObjectOES.idl
+ )
+ENDIF ()
+
+IF (WTF_USE_3D_GRAPHICS)
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
${OPENGL_INCLUDE_DIR}
- ${THIRDPARTY_DIR}/ANGLE/src
- #${THIRDPARTY_DIR}/ANGLE/include #Defined as SYSTEM include in order to have less priority than actual system headers
- ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
+ "${THIRDPARTY_DIR}/ANGLE/src"
+ "${THIRDPARTY_DIR}/ANGLE/include"
+ "${THIRDPARTY_DIR}/ANGLE/include/GLSLANG"
+ "${WEBCORE_DIR}/platform/graphics/gpu"
)
LIST(APPEND WebCore_LIBRARIES
${OPENGL_gl_LIBRARY}
@@ -2413,64 +2475,10 @@
)
LIST(APPEND WebCore_SOURCES
- html/canvas/OESStandardDerivatives.cpp
- html/canvas/OESTextureFloat.cpp
- html/canvas/OESVertexArrayObject.cpp
- html/canvas/WebGLBuffer.cpp
- html/canvas/WebGLCompressedTextureS3TC.cpp
- html/canvas/WebGLContextAttributes.cpp
- html/canvas/WebGLContextEvent.cpp
- html/canvas/WebGLContextGroup.cpp
- html/canvas/WebGLContextObject.cpp
- html/canvas/WebGLDebugRendererInfo.cpp
- html/canvas/WebGLDebugShaders.cpp
- html/canvas/WebGLDepthTexture.cpp
- html/canvas/WebGLFramebuffer.cpp
- html/canvas/WebGLGetInfo.cpp
- html/canvas/WebGLLoseContext.cpp
- html/canvas/WebGLObject.cpp
- html/canvas/WebGLProgram.cpp
- html/canvas/WebGLRenderbuffer.cpp
- html/canvas/WebGLRenderingContext.cpp
- html/canvas/WebGLShader.cpp
- html/canvas/WebGLShaderPrecisionFormat.cpp
- html/canvas/WebGLSharedObject.cpp
- html/canvas/WebGLTexture.cpp
- html/canvas/WebGLUniformLocation.cpp
- html/canvas/WebGLVertexArrayObjectOES.cpp
- html/canvas/WebGLExtension.cpp
- html/canvas/EXTTextureFilterAnisotropic.cpp
- html/canvas/OESStandardDerivatives.cpp
- html/canvas/OESTextureFloat.cpp
- html/canvas/OESVertexArrayObject.cpp
platform/graphics/ANGLEWebKitBridge.cpp
platform/graphics/GraphicsContext3D.cpp
platform/graphics/gpu/DrawingBuffer.cpp
)
- LIST(APPEND WebCore_IDL_FILES
- html/canvas/EXTTextureFilterAnisotropic.idl
- html/canvas/OESStandardDerivatives.idl
- html/canvas/OESTextureFloat.idl
- html/canvas/OESVertexArrayObject.idl
- html/canvas/WebGLActiveInfo.idl
- html/canvas/WebGLBuffer.idl
- html/canvas/WebGLCompressedTextureS3TC.idl
- html/canvas/WebGLContextAttributes.idl
- html/canvas/WebGLContextEvent.idl
- html/canvas/WebGLDebugRendererInfo.idl
- html/canvas/WebGLDebugShaders.idl
- html/canvas/WebGLDepthTexture.idl
- html/canvas/WebGLFramebuffer.idl
- html/canvas/WebGLLoseContext.idl
- html/canvas/WebGLProgram.idl
- html/canvas/WebGLRenderbuffer.idl
- html/canvas/WebGLRenderingContext.idl
- html/canvas/WebGLShader.idl
- html/canvas/WebGLShaderPrecisionFormat.idl
- html/canvas/WebGLTexture.idl
- html/canvas/WebGLUniformLocation.idl
- html/canvas/WebGLVertexArrayObjectOES.idl
- )
ENDIF ()
IF (ENABLE_REQUEST_ANIMATION_FRAME)
Modified: trunk/Source/WebCore/ChangeLog (122957 => 122958)
--- trunk/Source/WebCore/ChangeLog 2012-07-18 13:11:01 UTC (rev 122957)
+++ trunk/Source/WebCore/ChangeLog 2012-07-18 13:19:13 UTC (rev 122958)
@@ -1,3 +1,20 @@
+2012-07-18 YoungTaeck Song <[email protected]>
+
+ [WK2][EFL] Divide ENABLE(WEBGL) into ENABLE(WEBGL) and USE(3D_GRAPHICS) in CMakeLists.txt
+ https://bugs.webkit.org/show_bug.cgi?id=91584
+
+ Reviewed by Noam Rosenthal.
+
+ This patch is a subset of Efl's UI_SIDE_COMPOSITING implementation.
+ Modified CMakeLists.txt so that the basic 3D-graphics sources can be compiled even when WebGL is disabled.
+
+ * CMakeLists.txt:
+ * PlatformEfl.cmake:
+ * platform/graphics/GraphicsContext3D.h:
+ (GraphicsContext3D):
+ * platform/graphics/efl/GraphicsContext3DEfl.cpp:
+ (WebCore::GraphicsContext3D::platformGraphicsContext3D):
+
2012-07-18 Zoltan Horvath <[email protected]>
[Qt] Modify the using of the QImage::Format enum to the appropriate functions from NativeImageQt
Modified: trunk/Source/WebCore/PlatformEfl.cmake (122957 => 122958)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-07-18 13:11:01 UTC (rev 122957)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-07-18 13:19:13 UTC (rev 122958)
@@ -263,24 +263,30 @@
)
ENDIF ()
-IF (ENABLE_WEBGL)
+IF (WTF_USE_3D_GRAPHICS)
+ SET(WTF_USE_OPENGL 1)
+ ADD_DEFINITIONS(-DWTF_USE_OPENGL=1)
+
LIST(APPEND WebCore_INCLUDE_DIRECTORIES
- ${OPENGL_INCLUDE_DIR}
"${WEBCORE_DIR}/platform/graphics/cairo"
- "${WEBCORE_DIR}/platform/graphics/glx"
"${WEBCORE_DIR}/platform/graphics/opengl"
+ "${WEBCORE_DIR}/platform/graphics/texmap"
)
LIST(APPEND WebCore_LIBRARIES
${OPENGL_gl_LIBRARY}
)
LIST(APPEND WebCore_SOURCES
+ platform/graphics/OpenGLShims.cpp
platform/graphics/cairo/DrawingBufferCairo.cpp
+ platform/graphics/cairo/GLContext.cpp
platform/graphics/cairo/GraphicsContext3DCairo.cpp
- platform/graphics/glx/GraphicsContext3DPrivate.cpp
- platform/graphics/OpenGLShims.cpp
+ platform/graphics/cairo/GraphicsContext3DPrivate.cpp
platform/graphics/opengl/Extensions3DOpenGL.cpp
+ platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
+ platform/graphics/texmap/TextureMapperGL.cpp
+ platform/graphics/texmap/TextureMapperShaderManager.cpp
)
ENDIF ()
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (122957 => 122958)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-07-18 13:11:01 UTC (rev 122957)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2012-07-18 13:19:13 UTC (rev 122958)
@@ -510,7 +510,7 @@
PlatformLayer* platformLayer() const;
#endif
#elif PLATFORM(EFL)
- PlatformGraphicsContext3D platformGraphicsContext3D() const;
+ PlatformGraphicsContext3D platformGraphicsContext3D();
Platform3DObject platformTexture() const { return m_texture; }
#if USE(ACCELERATED_COMPOSITING)
PlatformLayer* platformLayer() const;
Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp (122957 => 122958)
--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2012-07-18 13:11:01 UTC (rev 122957)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2012-07-18 13:19:13 UTC (rev 122958)
@@ -51,7 +51,7 @@
{
}
-PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D() const
+PlatformGraphicsContext3D GraphicsContext3D::platformGraphicsContext3D()
{
return m_private->platformGraphicsContext3D();
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
