Attachment 370881 Details for Bug 197971 – Use a generic macro for EGL context version v2

[patch] Use a generic macro for EGL context version v2

patch_v3.patch (text/plain), 3.16 KB, created by Mads on 2019-05-29 13:40:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mads

Created: 2019-05-29 13:40:16 PDT

Size: 3.16 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 245594)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2019-05-21  Madhurkiran Harikrishnan  <madhurkiran.harikrishnan@xilinx.com>
>+
>+        Use a generic macro for EGL context version
>+        https://bugs.webkit.org/show_bug.cgi?id=197971
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There is no need to have a separate macros for egl context version,
>+        opengl profile mask etc. for EGL 1.5 and EGL 1.4, as they are essentially
>+        same. This will help fix the compilation error for targets which only
>+        supports EGL 1.4.
>+
>+        * platform/graphics/egl/GLContextEGL.cpp:
>+        (WebCore::GLContextEGL::createContextForEGLVersion):
>+
> 2019-05-21  Antoine Quint  <graouts@apple.com>
> 
>         [macOS] Compatibility mouse events aren't prevented by calling preventDefault() on pointerdown
>Index: Source/WebCore/platform/graphics/egl/GLContextEGL.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/egl/GLContextEGL.cpp	(revision 245594)
>+++ Source/WebCore/platform/graphics/egl/GLContextEGL.cpp	(working copy)
>@@ -401,21 +401,10 @@ EGLContext GLContextEGL::createContextFo
>         // we'll use whatever is available. In order to request a concrete version of OpenGL we need EGL version
>         // 1.5 or EGL version 1.4 with the extension EGL_KHR_create_context.
>         EGLContext context = EGL_NO_CONTEXT;
>+        const char* extensions = eglQueryString(platformDisplay.eglDisplay(), EGL_EXTENSIONS);
> 
>-        if (platformDisplay.eglCheckVersion(1, 5)) {
>-            contextAttributes[0] = EGL_CONTEXT_MAJOR_VERSION;
>-            contextAttributes[1] = 3;
>-            contextAttributes[2] = EGL_CONTEXT_MINOR_VERSION;
>-            contextAttributes[3] = 2;
>-            contextAttributes[4] = EGL_CONTEXT_OPENGL_PROFILE_MASK;
>-            contextAttributes[5] = EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT;
>-            contextAttributes[6] = EGL_NONE;
>-
>-            // Try to create a context with this configuration.
>-            context = eglCreateContext(platformDisplay.eglDisplay(), config, sharingContext, contextAttributes);
>-        } else if (platformDisplay.eglCheckVersion(1, 4)) {
>-            const char* extensions = eglQueryString(platformDisplay.eglDisplay(), EGL_EXTENSIONS);
>-            if (GLContext::isExtensionSupported(extensions, "EGL_KHR_create_context")) {
>+        if (platformDisplay.eglCheckVersion(1, 5)
>+            || (platformDisplay.eglCheckVersion(1, 4) && GLContext::isExtensionSupported(extensions, "EGL_KHR_create_context"))) {
>                 contextAttributes[0] = EGL_CONTEXT_MAJOR_VERSION_KHR;
>                 contextAttributes[1] = 3;
>                 contextAttributes[2] = EGL_CONTEXT_MINOR_VERSION_KHR;
>@@ -426,7 +415,6 @@ EGLContext GLContextEGL::createContextFo
> 
>                 // Try to create a context with this configuration.
>                 context = eglCreateContext(platformDisplay.eglDisplay(), config, sharingContext, contextAttributes);
>-            }
>         }
> 
>         // If the context creation worked, just return it.

Flags:

madhurkiran.h: review?
mcatanzaro: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 197971: 370090 | 370161 | 370304 | 370343 | 370881