Attachment #180968 for bug #105816

View Details Raw Unified Return to Bug 105816

| Differences between



2012-12-31  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL][WebGL] Add compile time support for GLES2.
        https://bugs.webkit.org/show_bug.cgi?id=105816

        Reviewed by NOBODY (OOPS!).

        This patch adds build support for GLES2.
        GLES2 support can be enabled during compile time by passing -DENABLE_GLES2=ON as
        cmake config parameter. GLES2 options is not enabled by default. This patch doesn't
        address all the build issues related to GLES2 but only adds the needed support in
        OptionsEfl.cmake.

        * Source/cmake/OptionsEfl.cmake:

2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.



2012-12-31  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL][WebGL] Add compile time support for GLES2.
        https://bugs.webkit.org/show_bug.cgi?id=105816

        This patch adds build support for GLES2.
        GLES2 support can be enabled during compile time by passing -DENABLE_GLES2=ON as
        cmake config parameter. GLES2 options is not enabled by default. This patch doesn't
        address all the build issues related to GLES2 but only adds the needed support in
        PlatformEfl.cmake.

        * PlatformEfl.cmake:

2012-12-30  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL] [WebGL] Minor cleanup in PlatformContext.



    endif ()

    list(APPEND WebCore_SOURCES
        platform/graphics/OpenGLShims.cpp
        platform/graphics/cairo/DrawingBufferCairo.cpp
        platform/graphics/efl/GraphicsContext3DEfl.cpp
        platform/graphics/efl/GraphicsContext3DPrivate.cpp
        platform/graphics/opengl/Extensions3DOpenGL.cpp
        platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
        platform/graphics/opengl/GLPlatformContext.cpp
        platform/graphics/opengl/GLPlatformSurface.cpp
        platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
        platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
        platform/graphics/surfaces/GraphicsSurface.cpp
        platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp

        )
    endif ()

    if (WTF_USE_OPENGL_ES_2)
        list(APPEND WebCore_SOURCES
            platform/graphics/opengl/Extensions3DOpenGLES.cpp
            platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
        )
    else ()
        list(APPEND WebCore_SOURCES
            platform/graphics/opengl/Extensions3DOpenGL.cpp
            platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
            platform/graphics/OpenGLShims.cpp
        )
    endif ()

    list(APPEND WebCore_LIBRARIES
        ${X11_X11_LIB}
        ${X11_Xcomposite_LIB}



    if (EGL_FOUND)
        set(WTF_USE_EGL 1)
        add_definitions(-DWTF_USE_EGL=1)
        option(ENABLE_GLES2 ON)

        if (ENABLE_GLES2)
            find_package(GLES REQUIRED)
        endif ()

        if (OPENGLES2_FOUND)
            set(WTF_USE_OPENGL_ES_2 1)
            add_definitions(-DWTF_USE_OPENGL_ES_2=1)
        endif ()
     elseif (OPENGLX_FOUND)
         set(WTF_USE_GLX 1)
         add_definitions(-DWTF_USE_GLX=1)

Return to Bug 105816

Lines 274-288 if (WTF_USE_3D_GRAPHICS) Source/WebCore/PlatformEfl.cmake_sec1
- Source/WebCore/PlatformEfl.cmake -3 / +13 lines
274	endif ()	274	endif ()
275		275
276	list(APPEND WebCore_SOURCES	276	list(APPEND WebCore_SOURCES
277	platform/graphics/OpenGLShims.cpp
278	platform/graphics/cairo/DrawingBufferCairo.cpp	277	platform/graphics/cairo/DrawingBufferCairo.cpp
279	platform/graphics/efl/GraphicsContext3DEfl.cpp	278	platform/graphics/efl/GraphicsContext3DEfl.cpp
280	platform/graphics/efl/GraphicsContext3DPrivate.cpp	279	platform/graphics/efl/GraphicsContext3DPrivate.cpp
281	platform/graphics/opengl/Extensions3DOpenGL.cpp
282	platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	280	platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
283	platform/graphics/opengl/GLPlatformContext.cpp	281	platform/graphics/opengl/GLPlatformContext.cpp
284	platform/graphics/opengl/GLPlatformSurface.cpp	282	platform/graphics/opengl/GLPlatformSurface.cpp
285	platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
286	platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp	283	platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
287	platform/graphics/surfaces/GraphicsSurface.cpp	284	platform/graphics/surfaces/GraphicsSurface.cpp
288	platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp	285	platform/graphics/surfaces/glx/GraphicsSurfaceGLX.cpp
Lines 306-311 if (WTF_USE_3D_GRAPHICS) Source/WebCore/PlatformEfl.cmake_sec2
306	)	303	)
307	endif ()	304	endif ()
308		305
		306	if (WTF_USE_OPENGL_ES_2)
		307	list(APPEND WebCore_SOURCES
		308	platform/graphics/opengl/Extensions3DOpenGLES.cpp
		309	platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
		310	)
		311	else ()
		312	list(APPEND WebCore_SOURCES
		313	platform/graphics/opengl/Extensions3DOpenGL.cpp
		314	platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
		315	platform/graphics/OpenGLShims.cpp
		316	)
		317	endif ()
		318
309	list(APPEND WebCore_LIBRARIES	319	list(APPEND WebCore_LIBRARIES
310	${X11_X11_LIB}	320	${X11_X11_LIB}
311	${X11_Xcomposite_LIB}	321	${X11_Xcomposite_LIB}

Lines 186-191 if (ENABLE_WEBGL OR WTF_USE_TILED_BACKING_STORE) Source/cmake/OptionsEfl.cmake_sec1
- Source/cmake/OptionsEfl.cmake +10 lines
186	if (EGL_FOUND)	186	if (EGL_FOUND)
187	set(WTF_USE_EGL 1)	187	set(WTF_USE_EGL 1)
188	add_definitions(-DWTF_USE_EGL=1)	188	add_definitions(-DWTF_USE_EGL=1)
		189	option(ENABLE_GLES2 ON)
		190
		191	if (ENABLE_GLES2)
		192	find_package(GLES REQUIRED)
		193	endif ()
		194
		195	if (OPENGLES2_FOUND)
		196	set(WTF_USE_OPENGL_ES_2 1)
		197	add_definitions(-DWTF_USE_OPENGL_ES_2=1)
		198	endif ()
189	elseif (OPENGLX_FOUND)	199	elseif (OPENGLX_FOUND)
190	set(WTF_USE_GLX 1)	200	set(WTF_USE_GLX 1)
191	add_definitions(-DWTF_USE_GLX=1)	201	add_definitions(-DWTF_USE_GLX=1)

Lines 1-3 ChangeLog_sec1
- ChangeLog +15 lines
		1	2012-12-31 Kondapally Kalyan <kalyan.kondapally@intel.com>
		2
		3	[EFL][WebGL] Add compile time support for GLES2.
		4	https://bugs.webkit.org/show_bug.cgi?id=105816
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	This patch adds build support for GLES2.
		9	GLES2 support can be enabled during compile time by passing -DENABLE_GLES2=ON as
		10	cmake config parameter. GLES2 options is not enabled by default. This patch doesn't
		11	address all the build issues related to GLES2 but only adds the needed support in
		12	OptionsEfl.cmake.
		13
		14	* Source/cmake/OptionsEfl.cmake:
		15
1	2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>	16	2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>
2		17
3	[EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.	18	[EFL] [WebGL] Rename EGLConfigHelper as EGLConfigSelector.

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +13 lines
		1	2012-12-31 Kondapally Kalyan <kalyan.kondapally@intel.com>
		2
		3	[EFL][WebGL] Add compile time support for GLES2.
		4	https://bugs.webkit.org/show_bug.cgi?id=105816
		5
		6	This patch adds build support for GLES2.
		7	GLES2 support can be enabled during compile time by passing -DENABLE_GLES2=ON as
		8	cmake config parameter. GLES2 options is not enabled by default. This patch doesn't
		9	address all the build issues related to GLES2 but only adds the needed support in
		10	PlatformEfl.cmake.
		11
		12	* PlatformEfl.cmake:
		13
1	2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>	14	2012-12-30 Kondapally Kalyan <kalyan.kondapally@intel.com>
2		15
3	[EFL] [WebGL] Minor cleanup in PlatformContext.	16	[EFL] [WebGL] Minor cleanup in PlatformContext.