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

glx: inline DRI_SWRAST

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:07:42 -04:00 • committed by Marge Bot
parent f5dd5e4b44
commit 63937eca78
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/glx/drisw_glx.c
View file

@ -633,14 +633,14 @@ drisw_create_context_attribs(struct glx_screen *base,
pcp->renderType = dca.render_type;
pcp->driContext =
psc->swrast->createContextAttribs(psc->driScreen,
dca.api,
config ? config->driConfig : NULL,
shared,
num_ctx_attribs / 2,
ctx_attribs,
error,
pcp);
driCreateContextAttribs(psc->driScreen,
dca.api,
config ? config->driConfig : NULL,
shared,
num_ctx_attribs / 2,
ctx_attribs,
error,
pcp);
*error = dri_context_error_to_glx_error(*error);
if (pcp->driContext == NULL) {
@ -673,7 +673,6 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
__GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) modes;
unsigned depth;
struct drisw_screen *psc = (struct drisw_screen *) base;
const __DRIswrastExtension *swrast = psc->swrast;
const __DRIkopperExtension *kopper = psc->kopper;
Display *dpy = psc->base.dpy;
@ -733,7 +732,7 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
}
else
pdp->driDrawable =
swrast->createNewDrawable(psc->driScreen, config->driConfig, pdp);
driCreateNewDrawable(psc->driScreen, config->driConfig, pdp);
if (!pdp->driDrawable) {
XDestroyDrawable(pdp, psc->base.dpy, xDrawable);
@ -962,7 +961,6 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
loader_extensions_local = loader_extensions_shm;
static const struct dri_extension_match exts[] = {
{ __DRI_SWRAST, 5, offsetof(struct drisw_screen, swrast), false },
{ __DRI_KOPPER, 1, offsetof(struct drisw_screen, kopper), true },
{ __DRI_COPY_SUB_BUFFER, 1, offsetof(struct drisw_screen, copySubBuffer), true },
};

1
src/glx/drisw_priv.h
View file

@ -39,7 +39,6 @@ struct drisw_screen
__DRIscreen *driScreen;
__GLXDRIscreen vtable;
const __DRIswrastExtension *swrast;
const __DRIkopperExtension *kopper;
const __DRI2flushExtension *f;
const __DRI2configQueryExtension *config;