From 4b8a55809ebb21281017efb81b54a3fbdd0d4b56 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 25 Aug 2016 14:35:39 +0100 Subject: egl/surfaceless: tweak surfaceless_add_configs_for_visuals() Analogous to previous commit. v2: Use correct comparison in loop conditional (Eric) Use valid C initializer (Gurchetan) Signed-off-by: Emil Velikov Reviewed-by: Gurchetan Singh Reviewed-by: Eric Engestrom --- src/egl/drivers/dri2/platform_surfaceless.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/egl/drivers/dri2/platform_surfaceless.c b/src/egl/drivers/dri2/platform_surfaceless.c index 9e2aa7c5630..3fc1a684b4f 100644 --- a/src/egl/drivers/dri2/platform_surfaceless.c +++ b/src/egl/drivers/dri2/platform_surfaceless.c @@ -189,25 +189,26 @@ surfaceless_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *dpy) { "RGB888", { 0xff0000, 0xff00, 0xff, 0x0 } }, { "RGB565", { 0x00f800, 0x07e0, 0x1f, 0x0 } }, }; + unsigned int format_count[ARRAY_SIZE(visuals)] = { 0 }; unsigned int count, i, j; count = 0; - for (i = 0; i < ARRAY_SIZE(visuals); i++) { - int format_count = 0; - - for (j = 0; dri2_dpy->driver_configs[j]; j++) { + for (i = 0; i < dri2_dpy->driver_configs[i]; i++) { + for (j = 0; j < ARRAY_SIZE(visuals); j++) { struct dri2_egl_config *dri2_conf; - dri2_conf = dri2_add_config(dpy, dri2_dpy->driver_configs[j], + dri2_conf = dri2_add_config(dpy, dri2_dpy->driver_configs[i], count + 1, EGL_PBUFFER_BIT, NULL, visuals[i].rgba_masks); if (dri2_conf) { count++; - format_count++; + format_count[j]++; } } + } - if (!format_count) { + for (i = 0; i < ARRAY_SIZE(format_count); i++) { + if (!format_count[i]) { _eglLog(_EGL_DEBUG, "No DRI config supports native format %s", visuals[i].format_name); } -- cgit v1.2.3