Attachment 144608 Details for Bug 67676 – A patch that fixes transparency.

[patch] A patch that fixes transparency.

0001-Fixes-transparency-with-EGL-and-X11.patch (text/plain), 10.44 KB, created by Hal Gentz on 2019-06-21 23:19:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hal Gentz

Created: 2019-06-21 23:19:33 UTC

Size: 10.44 KB

patch

obsolete

>From 301bdda2b8392066b0975f1b327a9f20b1d2be18 Mon Sep 17 00:00:00 2001
>From: Hal Gentz <zegentzy@protonmail.com>
>Date: Fri, 21 Jun 2019 15:09:34 -0600
>Subject: [PATCH 1/2] Fixes transparency with EGL and X11.
>
>This commit does this by allowing both RGB and RGBA visuals to match with EGL
>configs. We also expose the `EGL_MESA_config_select_group` egl
>extension, which is similar to GLX's visual select group extension, to
>allow the RGBA visuals to get less priority.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67676
>Cc: mesa-stable@lists.freedesktop.org
>Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
>---
> include/EGL/eglmesaext.h            |  5 ++++
> include/GL/internal/dri_interface.h |  3 ++-
> src/egl/drivers/dri2/egl_dri2.c     |  4 +++
> src/egl/drivers/dri2/platform_x11.c | 40 +++++++++++++----------------
> src/egl/main/eglconfig.c            |  9 +++++++
> src/egl/main/eglconfig.h            |  2 ++
> src/egl/main/eglglobals.c           |  3 ++-
> src/mesa/drivers/dri/common/utils.c |  2 ++
> src/mesa/main/mtypes.h              |  3 +++
> 9 files changed, 47 insertions(+), 24 deletions(-)
>
>diff --git a/include/EGL/eglmesaext.h b/include/EGL/eglmesaext.h
>index f4332b279f8..3864f0dd416 100644
>--- a/include/EGL/eglmesaext.h
>+++ b/include/EGL/eglmesaext.h
>@@ -86,6 +86,11 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOK) (EGLDisplay dpy, EG
> #define EGL_DRM_BUFFER_FORMAT_RGB565_MESA       0x3292
> #endif /* EGL_MESA_drm_image_formats */
> 
>+#ifndef EGL_MESA_config_select_group
>+#define EGL_MESA_config_select_group 1
>+#define EGL_CONFIG_SELECT_GROUP_MESA		0x31D9
>+#endif
>+
> #ifdef __cplusplus
> }
> #endif
>diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
>index af0ee9c5667..052e2b04b27 100644
>--- a/include/GL/internal/dri_interface.h
>+++ b/include/GL/internal/dri_interface.h
>@@ -766,7 +766,8 @@ struct __DRIuseInvalidateExtensionRec {
> #define __DRI_ATTRIB_YINVERTED			47
> #define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48
> #define __DRI_ATTRIB_MUTABLE_RENDER_BUFFER	49 /* EGL_MUTABLE_RENDER_BUFFER_BIT_KHR */
>-#define __DRI_ATTRIB_MAX			50
>+#define __DRI_ATTRIB_CONFIG_SELECT_GROUP	50
>+#define __DRI_ATTRIB_MAX			51
> 
> /* __DRI_ATTRIB_RENDER_TYPE */
> #define __DRI_ATTRIB_RGBA_BIT			0x01	
>diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
>index ee4faaab34f..96c3debeb33 100644
>--- a/src/egl/drivers/dri2/egl_dri2.c
>+++ b/src/egl/drivers/dri2/egl_dri2.c
>@@ -167,6 +167,7 @@ static const EGLint dri2_to_egl_attribute_map[__DRI_ATTRIB_MAX] = {
>    [__DRI_ATTRIB_MAX_SWAP_INTERVAL]     = EGL_MAX_SWAP_INTERVAL,
>    [__DRI_ATTRIB_MIN_SWAP_INTERVAL]     = EGL_MIN_SWAP_INTERVAL,
>    [__DRI_ATTRIB_YINVERTED]             = EGL_Y_INVERTED_NOK,
>+   [__DRI_ATTRIB_CONFIG_SELECT_GROUP]   = EGL_CONFIG_SELECT_GROUP_MESA,
> };
> 
> const __DRIconfig *
>@@ -182,6 +183,9 @@ dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type,
> static EGLBoolean
> dri2_match_config(const _EGLConfig *conf, const _EGLConfig *criteria)
> {
>+   if (conf->NativeVisualID != criteria->NativeVisualID)
>+      return EGL_FALSE;
>+
>    if (_eglCompareConfigs(conf, criteria, NULL, EGL_FALSE) != 0)
>       return EGL_FALSE;
> 
>diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
>index 0d62f83b411..c52befd5643 100644
>--- a/src/egl/drivers/dri2/platform_x11.c
>+++ b/src/egl/drivers/dri2/platform_x11.c
>@@ -266,7 +266,7 @@ dri2_x11_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
>       _eglError(EGL_BAD_ALLOC, "dri2_create_surface");
>       return NULL;
>    }
>-   
>+
>    if (!dri2_init_surface(&dri2_surf->base, disp, type, conf, attrib_list,
>                           false, native_surface))
>       goto cleanup_surf;
>@@ -411,7 +411,7 @@ dri2_x11_destroy_surface(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf)
>    (void) drv;
> 
>    dri2_dpy->core->destroyDrawable(dri2_surf->dri_drawable);
>-   
>+
>    if (dri2_dpy->dri2) {
>       xcb_dri2_destroy_drawable (dri2_dpy->conn, dri2_surf->drawable);
>    } else {
>@@ -791,19 +791,19 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
>       visuals = xcb_depth_visuals(d.data);
> 
>       for (int i = 0; i < xcb_depth_visuals_length(d.data); i++) {
>-	 if (class_added[visuals[i]._class])
>-	    continue;
>+         if (class_added[visuals[i]._class])
>+            continue;
> 
>-	 class_added[visuals[i]._class] = EGL_TRUE;
>+         class_added[visuals[i]._class] = EGL_TRUE;
> 
>-	 for (int j = 0; dri2_dpy->driver_configs[j]; j++) {
>+         for (int j = 0; dri2_dpy->driver_configs[j]; j++) {
>             struct dri2_egl_config *dri2_conf;
>             const __DRIconfig *config = dri2_dpy->driver_configs[j];
> 
>             const EGLint config_attrs[] = {
>-                    EGL_NATIVE_VISUAL_ID,    visuals[i].visual_id,
>-                    EGL_NATIVE_VISUAL_TYPE,  visuals[i]._class,
>-                    EGL_NONE
>+               EGL_NATIVE_VISUAL_ID,    visuals[i].visual_id,
>+               EGL_NATIVE_VISUAL_TYPE,  visuals[i]._class,
>+               EGL_NONE
>             };
> 
>             unsigned int rgba_masks[4] = {
>@@ -820,25 +820,21 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
>                if (dri2_conf->base.ConfigID == config_count + 1)
>                   config_count++;
> 
>-            /* Allow a 24-bit RGB visual to match a 32-bit RGBA EGLConfig.
>-             * Ditto for 30-bit RGB visuals to match a 32-bit RGBA EGLConfig.
>+            /* Allows RGB visuals to match a 32-bit RGBA EGLConfig.
>              * Otherwise it will only match a 32-bit RGBA visual.  On a
>              * composited window manager on X11, this will make all of the
>              * EGLConfigs with destination alpha get blended by the
>              * compositor.  This is probably not what the application
>              * wants... especially on drivers that only have 32-bit RGBA
>              * EGLConfigs! */
>-            if (d.data->depth == 24 || d.data->depth == 30) {
>-               rgba_masks[3] =
>-                  ~(rgba_masks[0] | rgba_masks[1] | rgba_masks[2]);
>-               dri2_conf = dri2_add_config(disp, config, config_count + 1,
>-                                           surface_type, config_attrs,
>-                                           rgba_masks);
>-               if (dri2_conf)
>-                  if (dri2_conf->base.ConfigID == config_count + 1)
>-                     config_count++;
>-            }
>-	 }
>+            rgba_masks[3] = ~(rgba_masks[0] | rgba_masks[1] | rgba_masks[2]);
>+            dri2_conf = dri2_add_config(disp, config, config_count + 1,
>+                                        surface_type, config_attrs,
>+                                        rgba_masks);
>+            if (dri2_conf)
>+               if (dri2_conf->base.ConfigID == config_count + 1)
>+                  config_count++;
>+         }
>       }
> 
>       xcb_depth_next(&d);
>diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
>index 72cd73d5179..6e38b5d403f 100644
>--- a/src/egl/main/eglconfig.c
>+++ b/src/egl/main/eglconfig.c
>@@ -258,6 +258,9 @@ static const struct {
>    { EGL_COLOR_COMPONENT_TYPE_EXT,  ATTRIB_TYPE_ENUM,
>                                     ATTRIB_CRITERION_EXACT,
>                                     EGL_COLOR_COMPONENT_TYPE_FIXED_EXT },
>+   { EGL_CONFIG_SELECT_GROUP_MESA,  ATTRIB_TYPE_INTEGER,
>+                                    ATTRIB_CRITERION_IGNORE,
>+                                    0 },
> };
> 
> 
>@@ -296,6 +299,8 @@ _eglValidateConfig(const _EGLConfig *conf, EGLBoolean for_matching)
>             if (val > 1 || val < 0)
>                valid = EGL_FALSE;
>             break;
>+         case EGL_CONFIG_SELECT_GROUP_MESA:
>+            break;
>          default:
>             if (val < 0)
>                valid = EGL_FALSE;
>@@ -608,6 +613,10 @@ _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2,
>    if (conf1 == conf2)
>       return 0;
> 
>+   val1 = conf1->ConfigSelectGroup - conf2->ConfigSelectGroup;
>+   if (val1)
>+      return val1;
>+
>    /* the enum values have the desired ordering */
>    STATIC_ASSERT(EGL_NONE < EGL_SLOW_CONFIG);
>    STATIC_ASSERT(EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG);
>diff --git a/src/egl/main/eglconfig.h b/src/egl/main/eglconfig.h
>index 605289de536..064187ff1dd 100644
>--- a/src/egl/main/eglconfig.h
>+++ b/src/egl/main/eglconfig.h
>@@ -89,6 +89,7 @@ struct _egl_config
>    EGLint FramebufferTargetAndroid;
>    EGLint RecordableAndroid;
>    EGLint ComponentType;
>+   EGLint ConfigSelectGroup;
> };
> 
> 
>@@ -139,6 +140,7 @@ _eglOffsetOfConfig(EGLint attr)
>    ATTRIB_MAP(EGL_FRAMEBUFFER_TARGET_ANDROID, FramebufferTargetAndroid);
>    ATTRIB_MAP(EGL_RECORDABLE_ANDROID,        RecordableAndroid);
>    ATTRIB_MAP(EGL_COLOR_COMPONENT_TYPE_EXT,  ComponentType);
>+   ATTRIB_MAP(EGL_CONFIG_SELECT_GROUP_MESA,  ConfigSelectGroup);
> #undef ATTRIB_MAP
>    default:
>       return -1;
>diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
>index 0d7270333ec..71d1fccf75f 100644
>--- a/src/egl/main/eglglobals.c
>+++ b/src/egl/main/eglglobals.c
>@@ -70,7 +70,8 @@ struct _egl_global _eglGlobal =
>    " EGL_EXT_device_query"
>    " EGL_EXT_platform_base"
>    " EGL_KHR_client_get_all_proc_addresses"
>-   " EGL_KHR_debug",
>+   " EGL_KHR_debug"
>+   " EGL_MESA_config_select_group",
> 
>    .PlatformExtensionString =
> #ifdef HAVE_WAYLAND_PLATFORM
>diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
>index 5a66bcf8e05..18a3c6f0806 100644
>--- a/src/mesa/drivers/dri/common/utils.c
>+++ b/src/mesa/drivers/dri/common/utils.c
>@@ -345,6 +345,7 @@ driCreateConfigs(mesa_format format,
> 		    modes->yInverted = GL_TRUE;
> 		    modes->sRGBCapable = is_srgb;
> 		    modes->mutableRenderBuffer = mutable_render_buffer;
>+		    modes->configSelectGroup = 0;
> 		}
> 	    }
> 	}
>@@ -430,6 +431,7 @@ static const struct { unsigned int attrib, offset; } attribMap[] = {
>     __ATTRIB(__DRI_ATTRIB_YINVERTED,			yInverted),
>     __ATTRIB(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE,	sRGBCapable),
>     __ATTRIB(__DRI_ATTRIB_MUTABLE_RENDER_BUFFER,	mutableRenderBuffer),
>+    __ATTRIB(__DRI_ATTRIB_CONFIG_SELECT_GROUP, configSelectGroup),
> 
>     /* The struct field doesn't matter here, these are handled by the
>      * switch in driGetConfigAttribIndex.  We need them in the array
>diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
>index 13e18e6e8ab..c7d09a2f54b 100644
>--- a/src/mesa/main/mtypes.h
>+++ b/src/mesa/main/mtypes.h
>@@ -216,6 +216,9 @@ struct gl_config
> 
>    /* EGL_KHR_mutable_render_buffer */
>    GLuint mutableRenderBuffer; /* bool */
>+
>+   /* EGL_MESA_config_select_group */
>+   GLint configSelectGroup;
> };
> 
> 
>-- 
>2.22.0
>

Actions: View | Splinter Review

Attachments on bug 67676: 93777 | 94274 | 111864 | 113529 | 113561 | 113563 | 113752 | 144608 | 144609 | 144610 | 144758

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.