OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dril: always take the egl init path

Browse Source 
using EGL_DEFAULT_DISPLAY will cover the swrast case, which
fixes generating all the correct configs

Fixes: ec7afd2c24 ("dril: rework config creation")

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30426>
This commit is contained in:
Mike Blumenkrantz
2024-07-30 12:38:24 -04:00
committed by Marge Bot
parent 086ed1e54b
commit ef88af8467
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/gallium/targets/dril/dril_target.c
View File

@@ -343,12 +343,15 @@ init_dri2_configs(int fd)
EGLBoolean (*peglGetConfigAttrib)(EGLDisplay, EGLConfig, EGLint, EGLint *) = peglGetProcAddress("eglGetConfigAttrib"); EGLBoolean (*peglGetConfigAttrib)(EGLDisplay, EGLConfig, EGLint, EGLint *) = peglGetProcAddress("eglGetConfigAttrib");
const char *(*peglQueryString)(EGLDisplay, EGLint) = peglGetProcAddress("eglQueryString"); const char *(*peglQueryString)(EGLDisplay, EGLint) = peglGetProcAddress("eglQueryString");
/* try opening GBM for hardware driver info */ struct gbm_device *gbm = NULL;
struct gbm_device *gbm = gbm_create_device(fd); if (fd != -1) {
if (!gbm) /* try opening GBM for hardware driver info */
goto out; gbm = gbm_create_device(fd);
if (!gbm)
goto out;
}
EGLDisplay dpy = peglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_MESA, gbm, NULL); EGLDisplay dpy = peglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_MESA, gbm ? gbm : EGL_DEFAULT_DISPLAY, NULL);
if (!dpy) if (!dpy)
goto out_gbm; goto out_gbm;
int maj, min; int maj, min;
@@ -415,7 +418,8 @@ out_egl:
peglTerminate(dpy); peglTerminate(dpy);
out_gbm: out_gbm:
gbm_device_destroy(gbm); if (gbm)
gbm_device_destroy(gbm);
out: out:
dlclose(egl); dlclose(egl);
if (c) if (c)
@@ -430,19 +434,9 @@ drilCreateNewScreen(int scrn, int fd,
const __DRIextension **driver_extensions, const __DRIextension **driver_extensions,
const __DRIconfig ***driver_configs, void *data) const __DRIconfig ***driver_configs, void *data)
{ {
/* multiply for possible 1/2/4/8/16/32 MSAA configs */ const __DRIconfig **configs = init_dri2_configs(fd);
// allocate an array of pointers if (!configs)
const __DRIconfig **configs = NULL; return NULL;
/* try dri2 if fd is valid */
if (fd >= 0)
configs = init_dri2_configs(fd);
if (!configs) {
configs = calloc(ARRAY_SIZE(drilConfigs) + 1, sizeof(void *));
// otherwise set configs to point to our config list
for (int i = 0; i < ARRAY_SIZE(drilConfigs); i++) {
configs[i] = mem_dup(&drilConfigs[i], sizeof(drilConfigs[i]));
}
}
// outpointer it // outpointer it
*driver_configs = configs; *driver_configs = configs;