AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: Replace the robustness DRI2 ext check with a pipe cap query.

Browse Source 
This means that swkms will now report it with llvmpipe.  drisw reported it
with llvmpipe, and it appears to have been an oversight that got
refactored into an obvious "if !swkms" check later.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20171>
This commit is contained in:
Emma Anholt
2022-11-30 15:23:56 -08:00
committed by Marge Bot
parent f4b2f9cff2
commit e6285ea55f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -736,7 +736,6 @@ static const struct dri_extension_match swrast_core_extensions[] = {
};
static const struct dri_extension_match optional_core_extensions[] = {
{ __DRI2_ROBUSTNESS, 1, offsetof(struct dri2_egl_display, robustness), true },
{ __DRI2_CONFIG_QUERY, 1, offsetof(struct dri2_egl_display, config), true },
{ __DRI2_FENCE, 2, offsetof(struct dri2_egl_display, fence), true },
{ __DRI2_BUFFER_DAMAGE, 1, offsetof(struct dri2_egl_display, buffer_damage), true },
@@ -892,8 +891,7 @@ dri2_setup_screen(_EGLDisplay *disp)
__DRI2_RENDERER_HAS_FRAMEBUFFER_SRGB))
disp->Extensions.KHR_gl_colorspace = EGL_TRUE;
if (dri2_dpy->robustness)
disp->Extensions.EXT_create_context_robustness = EGL_TRUE;
disp->Extensions.EXT_create_context_robustness = get_screen_param(disp, PIPE_CAP_DEVICE_RESET_STATUS_QUERY);
if (dri2_dpy->fence) {
disp->Extensions.KHR_fence_sync = EGL_TRUE;

1
src/egl/drivers/dri2/egl_dri2.h
View File

@@ -236,7 +236,6 @@ struct dri2_egl_display
const __DRI2flushControlExtension *flush_control;
const __DRItexBufferExtension *tex_buffer;
const __DRIimageExtension *image;
const __DRIrobustnessExtension *robustness;
const __DRI2configQueryExtension *config;
const __DRI2fenceExtension *fence;
const __DRI2bufferDamageExtension *buffer_damage;