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

egl/android: Remove check for EGLConfig presence

Browse source 
We now check in the EGL core that we actually have some configs for the
display, so no need to do it in the platform.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27709>
This commit is contained in:
Daniel Stone 2023-08-08 17:23:08 +01:00 • committed by Marge Bot
parent ac304d0393
commit e12a55c979
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -789,7 +789,7 @@ droid_destroy_loader_image_state(void *loaderPrivate)
#endif
}
static EGLBoolean
static void
droid_add_configs_for_visuals(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
@ -854,9 +854,9 @@ droid_add_configs_for_visuals(_EGLDisplay *disp)
disp, dri2_dpy->driver_configs[j], config_count + 1, surface_type,
config_attrs, visuals[i].rgba_shifts, visuals[i].rgba_sizes);
if (dri2_conf) {
format_count[i]++;
if (dri2_conf->base.ConfigID == config_count + 1)
config_count++;
format_count[i]++;
}
}
if (visuals[i].format == HAL_PIXEL_FORMAT_RGBA_8888 && format_count[i])
@ -869,8 +869,6 @@ droid_add_configs_for_visuals(_EGLDisplay *disp)
visuals[i].format);
}
}
return (config_count != 0);
}
static const struct dri2_egl_display_vtbl droid_display_vtbl = {
@ -1240,10 +1238,7 @@ dri2_initialize_android(_EGLDisplay *disp)
/* Create configs *after* enabling extensions because presence of DRI
* driver extensions can affect the capabilities of EGLConfigs.
*/
if (!droid_add_configs_for_visuals(disp)) {
err = "DRI2: failed to add configs";
goto cleanup;
}
droid_add_configs_for_visuals(disp);
/* Fill vtbl last to prevent accidentally calling virtual function during
* initialization.