On Fri, Sep 16, 2016 at 06:23:05PM +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> ... in dri2_x11_add_configs_for_visuals().
>
> Currently the latter does not consider that, thus in such cases it adds
> "empty" configs in the list.
>
> Properly account for things and as we do that we can reuse count,
> instead of calling _eglGetArraySize to deterime if we've added any
"determine" :)
> configs.
>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> src/egl/drivers/dri2/platform_x11.c | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/src/egl/drivers/dri2/platform_x11.c
> b/src/egl/drivers/dri2/platform_x11.c
> index 0b1b514..2921147 100644
> --- a/src/egl/drivers/dri2/platform_x11.c
> +++ b/src/egl/drivers/dri2/platform_x11.c
> @@ -723,7 +723,7 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display
> *dri2_dpy,
> xcb_screen_iterator_t s;
> xcb_depth_iterator_t d;
> xcb_visualtype_t *visuals;
> - int i, j, id;
> + int i, j, count;
> unsigned int rgba_masks[4];
> EGLint surface_type;
> EGLint config_attrs[] = {
> @@ -734,7 +734,7 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display
> *dri2_dpy,
>
> s = xcb_setup_roots_iterator(xcb_get_setup(dri2_dpy->conn));
> d = xcb_screen_allowed_depths_iterator(get_xcb_screen(s,
> dri2_dpy->screen));
> - id = 1;
> + count = 0;
>
> surface_type =
> EGL_WINDOW_BIT |
> @@ -754,6 +754,9 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display
> *dri2_dpy,
>
> class_added[visuals[i]._class] = EGL_TRUE;
> for (j = 0; dri2_dpy->driver_configs[j]; j++) {
> + struct dri2_egl_config *dri2_conf;
> + const __DRIconfig *config = dri2_dpy->driver_configs[j];
> +
> config_attrs[1] = visuals[i].visual_id;
> config_attrs[3] = visuals[i]._class;
>
> @@ -761,8 +764,10 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display
> *dri2_dpy,
> rgba_masks[1] = visuals[i].green_mask;
> rgba_masks[2] = visuals[i].blue_mask;
> rgba_masks[3] = 0;
> - dri2_add_config(disp, dri2_dpy->driver_configs[j], id++,
> - surface_type, config_attrs, rgba_masks);
> + dri2_conf = dri2_add_config(disp, config, count + 1,
> surface_type,
> + config_attrs, rgba_masks);
> + if (dri2_conf)
Nit: I would've just written `if (dri2_add_config(...))` instead of
storing a pointer that's never used (esp. not a fully qualified one;
a void pointer at least doesn't suggest we might want to dereference it)
The series is:
Reviewed-by: Eric Engestrom <e...@engestrom.ch>
> + count++;
>
> /* Allow a 24-bit RGB visual to match a 32-bit RGBA EGLConfig.
> * Otherwise it will only match a 32-bit RGBA visual. On a
> @@ -774,8 +779,10 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display
> *dri2_dpy,
> if (d.data->depth == 24) {
> rgba_masks[3] =
> ~(rgba_masks[0] | rgba_masks[1] | rgba_masks[2]);
> - dri2_add_config(disp, dri2_dpy->driver_configs[j], id++,
> - surface_type, config_attrs, rgba_masks);
> + dri2_conf = dri2_add_config(disp, config, count + 1,
> surface_type,
> + config_attrs, rgba_masks);
> + if (dri2_conf)
> + count++;
> }
> }
> }
> @@ -783,7 +790,7 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display
> *dri2_dpy,
> xcb_depth_next(&d);
> }
>
> - if (!_eglGetArraySize(disp->Configs)) {
> + if (!count) {
> _eglLog(_EGL_WARNING, "DRI2: failed to create any config");
> return EGL_FALSE;
> }
> --
> 2.9.3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
