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

glx: stop binding DRI_INTEROP

Browse Source 
no longer useful since innermost functions return errors correctly

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30450>
This commit is contained in:
Mike Blumenkrantz
2024-07-25 13:27:05 -04:00
committed by Marge Bot
parent 410076af84
commit 4cd4b9f70d
4 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glx/dri2_glx.c
View File

@@ -866,11 +866,6 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
"GLX_EXT_create_context_es2_profile");
}
static const struct dri_extension_match exts[] = {
{ __DRI2_INTEROP, 1, offsetof(struct dri2_screen, interop), true },
};
loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions);
/* Extensions where we don't care about the extension struct */
for (i = 0; extensions[i]; i++) {
if (strcmp(extensions[i]->name, __DRI2_ROBUSTNESS) == 0)
@@ -882,8 +877,7 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
__glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control");
__glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
if (psc->interop)
__glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop");
__glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop");
}
static char *

1
src/glx/dri2_priv.h
View File

@@ -45,7 +45,6 @@ struct dri2_screen {
__DRIscreen *driScreen;
__GLXDRIscreen vtable;
const __DRI2interopExtension *interop;
const __DRIconfig **driver_configs;
char *driverName;

4
src/glx/dri3_glx.c
View File

@@ -696,7 +696,6 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
static const struct dri_extension_match exts[] = {
{ __DRI_IMAGE, 1, offsetof(struct dri3_screen, image), true },
{ __DRI2_INTEROP, 1, offsetof(struct dri3_screen, interop), true },
};
loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions);
@@ -716,8 +715,7 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
__glXEnableDirectExtension(&psc->base, "GLX_ARB_context_flush_control");
__glXEnableDirectExtension(&psc->base, "GLX_MESA_query_renderer");
if (psc->interop)
__glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop");
__glXEnableDirectExtension(&psc->base, "GLX_MESA_gl_interop");
}
static char *

1
src/glx/dri3_priv.h
View File

@@ -80,7 +80,6 @@ struct dri3_screen {
__DRIscreen *driScreenRenderGPU;
const __DRIimageExtension *image;
const __DRI2interopExtension *interop;
const __DRIconfig **driver_configs;
/* fd of the GPU used for rendering. */