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

egl: inline DRI_MESA

Browse source 
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30472>
This commit is contained in:
Mike Blumenkrantz 2024-07-26 11:01:09 -04:00 • committed by Marge Bot
parent f51857aac2
commit 0f8a85487b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -902,7 +902,7 @@ dri2_create_screen(_EGLDisplay *disp)
* will not crash.
*/
if (strcmp(dri2_dpy->driver_name, driver_name_display_gpu) == 0) {
dri2_dpy->dri_screen_display_gpu = dri2_dpy->mesa->createNewScreen3(
dri2_dpy->dri_screen_display_gpu = driCreateNewScreen3(
0, dri2_dpy->fd_display_gpu, dri2_dpy->loader_extensions,
dri2_dpy->driver_extensions, &dri2_dpy->driver_configs, false, disp);
}
@ -911,7 +911,7 @@ dri2_create_screen(_EGLDisplay *disp)
}
int screen_fd = dri2_dpy->swrast ? -1 : dri2_dpy->fd_render_gpu;
dri2_dpy->dri_screen_render_gpu = dri2_dpy->mesa->createNewScreen3(
dri2_dpy->dri_screen_render_gpu = driCreateNewScreen3(
0, screen_fd, dri2_dpy->loader_extensions, dri2_dpy->driver_extensions,
&dri2_dpy->driver_configs, false, disp);
@ -988,7 +988,7 @@ dri2_setup_device(_EGLDisplay *disp, EGLBoolean software)
} else if (loader_is_device_render_capable(dri2_dpy->fd_render_gpu)) {
render_fd = dri2_dpy->fd_render_gpu;
} else {
render_fd = dri2_dpy->mesa->queryCompatibleRenderOnlyDeviceFd(
render_fd = dri_query_compatible_render_only_device_fd(
dri2_dpy->fd_render_gpu);
if (render_fd < 0)
return EGL_FALSE;
@ -1444,7 +1444,7 @@ dri2_create_context(_EGLDisplay *disp, _EGLConfig *conf,
&num_attribs))
goto cleanup;
dri2_ctx->dri_context = dri2_dpy->mesa->createContext(
dri2_ctx->dri_context = driCreateContextAttribs(
dri2_dpy->dri_screen_render_gpu, api, dri_config, shared, num_attribs / 2,
ctx_attribs, &error, dri2_ctx);
dri2_create_context_attribs_error(error);

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

@ -555,7 +555,7 @@ get_fd_render_gpu_drm(struct gbm_dri_device *gbm_dri, int fd_display_gpu)
return fd_display_gpu;
/* Display-only device, so return a compatible render-only device. */
return gbm_dri->mesa->queryCompatibleRenderOnlyDeviceFd(fd_display_gpu);
return dri_query_compatible_render_only_device_fd(fd_display_gpu);
}
EGLBoolean