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

glx: inline DRI_DRI2

Browse Source 
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30400>
This commit is contained in:
Mike Blumenkrantz
2024-07-25 07:32:18 -04:00
committed by Marge Bot
parent 5019481a16
commit 5d72058556
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/glx/dri2_glx.c
View File

@@ -224,7 +224,7 @@ dri2_create_context_attribs(struct glx_screen *base,
pcp->renderType = dca.render_type;
pcp->driContext =
psc->dri2->createContextAttribs(psc->driScreen,
driCreateContextAttribs(psc->driScreen,
dca.api,
config ? config->driConfig : NULL,
shared,
@@ -300,8 +300,7 @@ dri2CreateDrawable(struct glx_screen *base, XID xDrawable,
DRI2CreateDrawable(psc->base.dpy, xDrawable);
/* Create a new drawable */
pdraw->driDrawable =
psc->dri2->createNewDrawable(psc->driScreen,
config->driConfig, pdraw);
driCreateNewDrawable(psc->driScreen, config->driConfig, pdraw);
if (!pdraw->driDrawable) {
DRI2DestroyDrawable(psc->base.dpy, xDrawable);
@@ -868,7 +867,7 @@ static void
dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
const char *driverName)
{
const unsigned mask = psc->dri2->getAPIMask(psc->driScreen);
const unsigned mask = driGetAPIMask(psc->driScreen);
const __DRIextension **extensions;
int i;
@@ -1022,12 +1021,6 @@ dri2CreateScreen(int screen, struct glx_display * priv, bool driver_name_is_infe
if (extensions == NULL)
goto handle_error;
static const struct dri_extension_match exts[] = {
{ __DRI_DRI2, 5, offsetof(struct dri2_screen, dri2), false },
};
if (!loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions))
goto handle_error;
psc->driScreen = driCreateNewScreen3(screen, psc->fd, loader_extensions, extensions,
&driver_configs, driver_name_is_inferred, psc);

1
src/glx/dri2_priv.h
View File

@@ -44,7 +44,6 @@ struct dri2_screen {
__DRIscreen *driScreen;
__GLXDRIscreen vtable;
const __DRIdri2Extension *dri2;
const __DRI2flushExtension *f;
const __DRI2configQueryExtension *config;