mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-01-27 16:14:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

egl: Replace sRGB support check with a pscreen query.

Browse Source 
This drops the remaining use of rendererQuery from EGL.

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:43:59 -08:00 committed by Marge Bot
parent eb2dcda50c
commit 5ff8edaa2a
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GL/internal/dri_interface.h
View File

@ -1926,10 +1926,6 @@ typedef struct __DRIconfigOptionsExtensionRec {
#define __DRI2_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION 0x0008
#define __DRI2_RENDERER_OPENGL_ES_PROFILE_VERSION 0x0009
#define __DRI2_RENDERER_OPENGL_ES2_PROFILE_VERSION 0x000a
/* Whether there is an sRGB format support for every supported 32-bit UNORM
* color format.
*/
#define __DRI2_RENDERER_HAS_FRAMEBUFFER_SRGB 0x000c
#define __DRI2_RENDERER_PREFER_BACK_BUFFER_REUSE 0x000f

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

@ -739,7 +739,6 @@ static const struct dri_extension_match optional_core_extensions[] = {
{ __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 },
{ __DRI2_RENDERER_QUERY, 1, offsetof(struct dri2_egl_display, rendererQuery), true },
{ __DRI2_INTEROP, 1, offsetof(struct dri2_egl_display, interop), true },
{ __DRI_IMAGE, 6, offsetof(struct dri2_egl_display, image), true },
{ __DRI2_FLUSH_CONTROL, 1, offsetof(struct dri2_egl_display, flush_control), true },
@ -802,19 +801,6 @@ dri2_load_driver_swrast(_EGLDisplay *disp)
return dri2_load_driver_common(disp, swrast_driver_extensions, ARRAY_SIZE(swrast_driver_extensions));
}
static unsigned
dri2_renderer_query_integer(struct dri2_egl_display *dri2_dpy, int param)
{
const __DRI2rendererQueryExtension *rendererQuery = dri2_dpy->rendererQuery;
unsigned int value = 0;
if (!rendererQuery ||
rendererQuery->queryInteger(dri2_dpy->dri_screen, param, &value) == -1)
return 0;
return value;
}
static const char *
dri2_query_driver_name(_EGLDisplay *disp)
{
@ -848,6 +834,7 @@ dri2_setup_screen(_EGLDisplay *disp)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri_screen *screen = dri_screen(dri2_dpy->dri_screen);
struct pipe_screen *pscreen = screen->base.screen;
unsigned int api_mask = screen->api_mask;
/*
@ -887,9 +874,12 @@ dri2_setup_screen(_EGLDisplay *disp)
disp->Extensions.EXT_pixel_format_float = EGL_TRUE;
if (dri2_renderer_query_integer(dri2_dpy,
__DRI2_RENDERER_HAS_FRAMEBUFFER_SRGB))
if (pscreen->is_format_supported(pscreen,
PIPE_FORMAT_B8G8R8A8_SRGB,
PIPE_TEXTURE_2D, 0, 0,
PIPE_BIND_RENDER_TARGET)) {
disp->Extensions.KHR_gl_colorspace = EGL_TRUE;
}
disp->Extensions.EXT_create_context_robustness = get_screen_param(disp, PIPE_CAP_DEVICE_RESET_STATUS_QUERY);

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

@ -240,7 +240,6 @@ struct dri2_egl_display
const __DRI2fenceExtension *fence;
const __DRI2bufferDamageExtension *buffer_damage;
const __DRI2blobExtension *blob;
const __DRI2rendererQueryExtension *rendererQuery;
const __DRI2interopExtension *interop;
const __DRIconfigOptionsExtension *configOptions;
const __DRImutableRenderBufferDriverExtension *mutable_render_buffer;

7
src/gallium/frontends/dri/dri_query_renderer.c
View File

@ -114,13 +114,6 @@ dri2_query_renderer_integer(__DRIscreen *_screen, int param,
PIPE_CAP_UMA);
return 0;
case __DRI2_RENDERER_HAS_FRAMEBUFFER_SRGB:
value[0] =
screen->base.screen->is_format_supported(screen->base.screen,
PIPE_FORMAT_B8G8R8A8_SRGB,
PIPE_TEXTURE_2D, 0, 0,
PIPE_BIND_RENDER_TARGET);
return 0;
case __DRI2_RENDERER_PREFER_BACK_BUFFER_REUSE:
value[0] =
screen->base.screen->get_param(screen->base.screen,