Module: Mesa Branch: 10.4 Commit: 1a929baa0b27373265a4a7d9f04d9925b7b6ac17 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a929baa0b27373265a4a7d9f04d9925b7b6ac17
Author: Daniel Stone <[email protected]> Date: Mon Mar 2 13:52:59 2015 +0000 egl: Take alpha bits into account when selecting GBM formats This fixes piglit when using PIGLIT_PLATFORM=gbm Tom Stellard: - Fix ARGB2101010 format Cc: "10.4 10.5" <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit 65c8965d033cf9ade5e6f3c88bda6d247d46af9d) --- src/egl/drivers/dri2/platform_drm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 753c60f..affb807 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -668,15 +668,21 @@ dri2_initialize_drm(_EGLDriver *drv, _EGLDisplay *disp) for (i = 0; dri2_dpy->driver_configs[i]; i++) { EGLint format, attr_list[3]; - unsigned int mask; + unsigned int red, alpha; dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i], - __DRI_ATTRIB_RED_MASK, &mask); - if (mask == 0x3ff00000) + __DRI_ATTRIB_RED_MASK, &red); + dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[i], + __DRI_ATTRIB_ALPHA_MASK, &alpha); + if (red == 0x3ff00000 && alpha == 0x00000000) format = GBM_FORMAT_XRGB2101010; - else if (mask == 0x00ff0000) + else if (red == 0x3ff00000 && alpha == 0xc0000000) + format = GBM_FORMAT_ARGB2101010; + else if (red == 0x00ff0000 && alpha == 0x00000000) format = GBM_FORMAT_XRGB8888; - else if (mask == 0xf800) + else if (red == 0x00ff0000 && alpha == 0xff000000) + format = GBM_FORMAT_ARGB8888; + else if (red == 0xf800) format = GBM_FORMAT_RGB565; else continue; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
