Attachment #191196 for bug #111291

View Details Raw Unified Return to Bug 111291

| Differences between



2013-03-04  Kondapally Kalyan  <kalyan.kondapally@intel.com>

        [EFL] Build fix when compiling with GLES2 support enabled.
        https://bugs.webkit.org/show_bug.cgi?id=111291

        Reviewed by Kenneth Rohde Christiansen.

        This patch fixes build issues when compiling with GLES2
        support. As part of the fix the patch removes Evas specific
        workaround of using GLX with EGL in PlatformContext as GLES2 
        is the main target with EGL.

        * platform/graphics/OpenGLESShims.h:
        * platform/graphics/opengl/GLPlatformContext.cpp:
        (WebCore::GLCurrentContextWrapper::GLCurrentContextWrapper):
        * platform/graphics/texmap/TextureMapper.h:

2013-03-04  Adam Bergkvist  <adam.bergkvist@ericsson.com>

        MediaStream API: local addTrack() and removeTrack() operations should not fire events.

Lines 26-32 Source/WebCore/platform/graphics/OpenGLESShims.h_sec1
- Source/WebCore/platform/graphics/OpenGLESShims.h -1 / +1 lines
26	#ifndef OpenGLESShims_h	26	#ifndef OpenGLESShims_h
27	#define OpenGLESShims_h	27	#define OpenGLESShims_h
28		28
29	#if PLATFORM(BLACKBERRY) \|\| PLATFORM(QT) \|\| PLATFORM(GTK)	29	#if PLATFORM(BLACKBERRY) \|\| PLATFORM(QT) \|\| PLATFORM(GTK) \|\| PLATFORM(EFL)
30	#define glBindFramebufferEXT glBindFramebuffer	30	#define glBindFramebufferEXT glBindFramebuffer
31	#define glFramebufferTexture2DEXT glFramebufferTexture2D	31	#define glFramebufferTexture2DEXT glFramebufferTexture2D
32	#define glBindRenderbufferEXT glBindRenderbuffer	32	#define glBindRenderbufferEXT glBindRenderbuffer




#include "NotImplemented.h"

#if HAVE(GLX)
#include <GL/glx.h>
#endif

namespace WebCore {

#if USE(OPENGL_ES_2)

    GLCurrentContextWrapper()
        : GLPlatformContext()
    {
#if USE(GLX)
#if USE(GLX) || PLATFORM(EFL)
        m_contextHandle = glXGetCurrentContext();
#elif USE(EGL)
        m_contextHandle = eglGetCurrentContext();

Lines 28-34 Source/WebCore/platform/graphics/texmap/TextureMapper.h_sec1
- Source/WebCore/platform/graphics/texmap/TextureMapper.h -1 / +1 lines
28	#define TEXMAP_OPENGL_ES_2	28	#define TEXMAP_OPENGL_ES_2
29	#endif	29	#endif
30	#endif	30	#endif
31	#if PLATFORM(GTK) && USE(OPENGL_ES_2)	31	#if (PLATFORM(GTK) \|\| PLATFORM(EFL)) && USE(OPENGL_ES_2)
32	#define TEXMAP_OPENGL_ES_2	32	#define TEXMAP_OPENGL_ES_2
33	#endif	33	#endif
34		34

Return to Bug 111291

Lines 36-45 Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp_sec1
- Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp -6 / +1 lines
36		36
37	#include "NotImplemented.h"	37	#include "NotImplemented.h"
38		38
39	#if HAVE(GLX)
40	#include <GL/glx.h>
41	#endif
42
43	namespace WebCore {	39	namespace WebCore {
44		40
45	#if USE(OPENGL_ES_2)	41	#if USE(OPENGL_ES_2)
Lines 55-62 public: Source/WebCore/platform/graphics/opengl/GLPlatformContext.cpp_sec2
55	GLCurrentContextWrapper()	51	GLCurrentContextWrapper()
56	: GLPlatformContext()	52	: GLPlatformContext()
57	{	53	{
58	// FIXME:: This is a workaround until support to build evas with EGL has been added.	54	#if USE(GLX)
59	#if USE(GLX) \|\| PLATFORM(EFL)
60	m_contextHandle = glXGetCurrentContext();	55	m_contextHandle = glXGetCurrentContext();
61	#elif USE(EGL)	56	#elif USE(EGL)
62	m_contextHandle = eglGetCurrentContext();	57	m_contextHandle = eglGetCurrentContext();

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +17 lines
		1	2013-03-04 Kondapally Kalyan <kalyan.kondapally@intel.com>
		2
		3	[EFL] Build fix when compiling with GLES2 support enabled.
		4	https://bugs.webkit.org/show_bug.cgi?id=111291
		5
		6	Reviewed by Kenneth Rohde Christiansen.
		7
		8	This patch fixes build issues when compiling with GLES2
		9	support. As part of the fix the patch removes Evas specific
		10	workaround of using GLX with EGL in PlatformContext as GLES2
		11	is the main target with EGL.
		12
		13	* platform/graphics/OpenGLESShims.h:
		14	* platform/graphics/opengl/GLPlatformContext.cpp:
		15	(WebCore::GLCurrentContextWrapper::GLCurrentContextWrapper):
		16	* platform/graphics/texmap/TextureMapper.h:
		17
1	2013-03-04 Adam Bergkvist <adam.bergkvist@ericsson.com>	18	2013-03-04 Adam Bergkvist <adam.bergkvist@ericsson.com>
2		19
3	MediaStream API: local addTrack() and removeTrack() operations should not fire events.	20	MediaStream API: local addTrack() and removeTrack() operations should not fire events.