fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: delete DRI_KOPPER

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 08:16:45 -04:00 • committed by Marge Bot
parent 192febfbbf
commit 62847d14b5
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/glx/drisw_glx.c
View file

@ -534,7 +534,7 @@ kopper_get_buffer_age(__GLXDRIdrawable *pdraw)
struct drisw_screen *psc = (struct drisw_screen *) pdraw->psc;
if (psc->kopper)
return psc->kopper->queryBufferAge(pdp->driDrawable);
return kopperQueryBufferAge(pdp->driDrawable);
}
return 0;
}
@ -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 __DRIkopperExtension *kopper = psc->kopper;
Display *dpy = psc->base.dpy;
xcb_connection_t *conn = XGetXCBConnection(dpy);
@ -719,16 +718,16 @@ driswCreateDrawable(struct glx_screen *base, XID xDrawable,
}
/* Create a new drawable */
if (kopper) {
if (psc->kopper) {
pdp->driDrawable =
kopper->createNewDrawable(psc->driScreen, config->driConfig, pdp,
kopperCreateNewDrawable(psc->driScreen, config->driConfig, pdp,
&(__DRIkopperDrawableInfo){
.multiplanes_available = base->display->has_multibuffer,
.is_pixmap = !(type & GLX_WINDOW_BIT),
});
pdp->swapInterval = dri_get_initial_swap_interval(psc->driScreen, psc->config);
psc->kopper->setSwapInterval(pdp->driDrawable, pdp->swapInterval);
kopperSetSwapInterval(pdp->driDrawable, pdp->swapInterval);
}
else
pdp->driDrawable =
@ -762,7 +761,7 @@ driswSwapBuffers(__GLXDRIdrawable * pdraw,
}
if (psc->kopper)
return psc->kopper->swapBuffers (pdp->driDrawable, 0);
return kopperSwapBuffers (pdp->driDrawable, 0);
driSwapBuffers(pdp->driDrawable);
@ -911,7 +910,7 @@ driswKopperSetSwapInterval(__GLXDRIdrawable *pdraw, int interval)
if (!dri_valid_swap_interval(psc->driScreen, psc->config, interval))
return GLX_BAD_VALUE;
psc->kopper->setSwapInterval(pdp->driDrawable, interval);
kopperSetSwapInterval(pdp->driDrawable, interval);
pdp->swapInterval = interval;
return 0;
@ -939,11 +938,11 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
/* this is only relevant if zink bits are set */
glx_driver &= (GLX_DRIVER_ZINK_INFER | GLX_DRIVER_ZINK_YES);
const char *driver = glx_driver && !kopper_disable ? "zink" : "swrast";
bool kopper = !strcmp(driver, "zink");
psc = calloc(1, sizeof *psc);
if (psc == NULL)
return NULL;
psc->kopper = !strcmp(driver, "zink");
if (!glx_screen_init(&psc->base, screen, priv)) {
free(psc);
@ -963,7 +962,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_KOPPER, 1, offsetof(struct drisw_screen, kopper), true },
{ __DRI_COPY_SUB_BUFFER, 1, offsetof(struct drisw_screen, copySubBuffer), true },
};
if (!loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions))
@ -1008,7 +1006,7 @@ driswCreateScreen(int screen, struct glx_display *priv, enum glx_driver glx_driv
if (psc->copySubBuffer)
psp->copySubBuffer = driswCopySubBuffer;
if (kopper) {
if (psc->kopper) {
psp->getBufferAge = kopper_get_buffer_age;
psp->setSwapInterval = driswKopperSetSwapInterval;
psp->getSwapInterval = kopperGetSwapInterval;

2
src/glx/drisw_priv.h
View file

@ -39,7 +39,6 @@ struct drisw_screen
__DRIscreen *driScreen;
__GLXDRIscreen vtable;
const __DRIkopperExtension *kopper;
const __DRI2flushExtension *f;
const __DRI2configQueryExtension *config;
const __DRItexBufferExtension *texBuffer;
@ -49,6 +48,7 @@ struct drisw_screen
const __DRIconfig **driver_configs;
char *name;
bool kopper;
};
struct drisw_drawable