From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 16 Aug 2016 16:56:34 +0000 (+0100)
Subject: egl/surfaceless: don't check the mask(s) prior to calling dri2_add_config
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d0155bcbe8eada0386275c382a4b0421dc8418f6;p=mesa.git

egl/surfaceless: don't check the mask(s) prior to calling dri2_add_config

The latter already does it for us.

As we're here annotate the masks as const and use unsigned for the
index(es).

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
---

diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c
index 2afcbd75bea..c75a895e616 100644
--- a/src/egl/drivers/dri2/platform_surfaceless.c
+++ b/src/egl/drivers/dri2/platform_surfaceless.c
@@ -183,38 +183,21 @@ surfaceless_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *dpy)
 
    struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
 
-   unsigned int visuals[3][4] = {
+   static const unsigned int visuals[3][4] = {
       { 0xff0000, 0xff00, 0xff, 0xff000000 },   // ARGB8888
       { 0xff0000, 0xff00, 0xff, 0x0 },          // RGB888
       { 0xf800, 0x7e0, 0x1f, 0x0  },            // RGB565
    };
 
-   int count, i, j;
-   unsigned int r, b, g, a;
+   unsigned int count, i, j;
 
    count = 0;
    for (i = 0; i < ARRAY_SIZE(visuals); i++) {
       for (j = 0; dri2_dpy->driver_configs[j]; j++) {
-         const EGLint surface_type = EGL_PBUFFER_BIT;
          struct dri2_egl_config *dri2_conf;
 
-         /* Determine driver supported masks */
-         dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
-                                       __DRI_ATTRIB_RED_MASK, &r);
-         dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
-                                       __DRI_ATTRIB_BLUE_MASK, &b);
-         dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
-                                       __DRI_ATTRIB_GREEN_MASK, &g);
-         dri2_dpy->core->getConfigAttrib(dri2_dpy->driver_configs[j],
-                                       __DRI_ATTRIB_ALPHA_MASK, &a);
-
-         /* Compare with advertised visuals */
-         if (r ^ visuals[i][0] || g ^ visuals[i][1]
-            || b ^ visuals[i][2] || a ^ visuals[i][3])
-            continue;
-
          dri2_conf = dri2_add_config(dpy, dri2_dpy->driver_configs[j],
-               count + 1, surface_type, NULL, visuals[i]);
+               count + 1, EGL_PBUFFER_BIT, NULL, visuals[i]);
 
          if (dri2_conf)
             count++;