KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2016-08-16 17:56:34 +01:00 committed by Emil Velikov
parent ff700f8c22
commit d0155bcbe8
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/egl/drivers/dri2/platform_surfaceless.c
View File

@ -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++;