fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 05:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

egl: Remove shifts/sizes from dri2_add_config argument

Browse source 
All the callers now do their own filtering on driver configs to decide
whether or not to add them.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27709>
This commit is contained in:
Daniel Stone 2023-08-09 15:01:07 +01:00 • committed by Marge Bot
parent e66305d681
commit 832d814852
6 changed files with 7 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/egl/drivers/dri2/egl_dri2.c
View file

@ -336,8 +336,7 @@ dri2_image_format_for_pbuffer_config(struct dri2_egl_display *dri2_dpy,
struct dri2_egl_config *
dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config,
EGLint surface_type, const EGLint *attr_list,
const int *rgba_shifts, const unsigned int *rgba_sizes)
EGLint surface_type, const EGLint *attr_list)
{
struct dri2_egl_config *conf;
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
@ -345,8 +344,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config,
unsigned int attrib, value, double_buffer;
bool srgb = false;
EGLint key, bind_to_texture_rgb, bind_to_texture_rgba;
int dri_shifts[4] = {-1, -1, -1, -1};
unsigned int dri_sizes[4] = {0, 0, 0, 0};
_EGLConfig *matching_config;
EGLint num_configs = 0;
EGLint config_id;
@ -397,57 +394,21 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config,
break;
case __DRI_ATTRIB_RED_SIZE:
dri_sizes[0] = value;
base.RedSize = value;
break;
case __DRI_ATTRIB_RED_MASK:
dri_shifts[0] = ffs(value) - 1;
break;
case __DRI_ATTRIB_RED_SHIFT:
dri_shifts[0] = value;
break;
case __DRI_ATTRIB_GREEN_SIZE:
dri_sizes[1] = value;
base.GreenSize = value;
break;
case __DRI_ATTRIB_GREEN_MASK:
dri_shifts[1] = ffs(value) - 1;
break;
case __DRI_ATTRIB_GREEN_SHIFT:
dri_shifts[1] = value;
break;
case __DRI_ATTRIB_BLUE_SIZE:
dri_sizes[2] = value;
base.BlueSize = value;
break;
case __DRI_ATTRIB_BLUE_MASK:
dri_shifts[2] = ffs(value) - 1;
break;
case __DRI_ATTRIB_BLUE_SHIFT:
dri_shifts[2] = value;
break;
case __DRI_ATTRIB_ALPHA_SIZE:
dri_sizes[3] = value;
base.AlphaSize = value;
break;
case __DRI_ATTRIB_ALPHA_MASK:
dri_shifts[3] = ffs(value) - 1;
break;
case __DRI_ATTRIB_ALPHA_SHIFT:
dri_shifts[3] = value;
break;
case __DRI_ATTRIB_ACCUM_RED_SIZE:
case __DRI_ATTRIB_ACCUM_GREEN_SIZE:
case __DRI_ATTRIB_ACCUM_BLUE_SIZE:
@ -485,12 +446,6 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config,
for (int i = 0; attr_list[i] != EGL_NONE; i += 2)
_eglSetConfigKey(&base, attr_list[i], attr_list[i + 1]);
if (rgba_shifts && memcmp(rgba_shifts, dri_shifts, sizeof(dri_shifts)))
return NULL;
if (rgba_sizes && memcmp(rgba_sizes, dri_sizes, sizeof(dri_sizes)))
return NULL;
base.NativeRenderable = EGL_TRUE;
base.SurfaceType = surface_type;
@ -585,7 +540,7 @@ dri2_add_pbuffer_configs_for_visuals(_EGLDisplay *disp)
continue;
dri2_conf = dri2_add_config(disp, dri2_dpy->driver_configs[i],
EGL_PBUFFER_BIT, NULL, NULL, NULL);
EGL_PBUFFER_BIT, NULL);
if (dri2_conf)
format_count[idx]++;
}

3
src/egl/drivers/dri2/egl_dri2.h
View file

@ -522,8 +522,7 @@ dri2_image_format_for_pbuffer_config(struct dri2_egl_display *dri2_dpy,
struct dri2_egl_config *
dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config,
EGLint surface_type, const EGLint *attr_list,
const int *rgba_shifts, const unsigned int *rgba_sizes);
EGLint surface_type, const EGLint *attr_list);
void
dri2_add_pbuffer_configs_for_visuals(_EGLDisplay *disp);

3
src/egl/drivers/dri2/platform_android.c
View file

@ -855,8 +855,7 @@ droid_add_configs_for_visuals(_EGLDisplay *disp)
};
struct dri2_egl_config *dri2_conf = dri2_add_config(
disp, dri2_dpy->driver_configs[j], surface_type, config_attrs,
NULL, NULL);
disp, dri2_dpy->driver_configs[j], surface_type, config_attrs);
if (dri2_conf)
format_count[i]++;
}

2
src/egl/drivers/dri2/platform_drm.c
View file

@ -512,7 +512,7 @@ drm_add_configs_for_visuals(_EGLDisplay *disp)
dri2_conf =
dri2_add_config(disp, dri2_dpy->driver_configs[i], EGL_WINDOW_BIT,
attr_list, NULL, NULL);
attr_list);
if (dri2_conf)
format_count[j]++;
}

2
src/egl/drivers/dri2/platform_wayland.c
View file

@ -1991,7 +1991,7 @@ dri2_wl_add_configs_for_visuals(_EGLDisplay *disp)
/* The format is supported one way or another; add the EGLConfig */
dri2_conf = dri2_add_config(disp, dri2_dpy->driver_configs[i],
EGL_WINDOW_BIT, NULL, NULL, NULL);
EGL_WINDOW_BIT, NULL);
if (!dri2_conf)
continue;

3
src/egl/drivers/dri2/platform_x11.c
View file

@ -854,8 +854,7 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
continue;
}
dri2_add_config(disp, config, surface_type, config_attrs,
NULL, NULL);
dri2_add_config(disp, config, surface_type, config_attrs);
}
}