fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 09:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glx: inline DRI2_FLUSH

Browse source 
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 11:53:59 -04:00 • committed by Marge Bot
parent 326d7ae64a
commit 53fd2eca4e
6 changed files with 12 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/glx/dri2_glx.c
View file

@ -445,14 +445,13 @@ dri2Flush(struct dri2_screen *psc,
unsigned flags,
enum __DRI2throttleReason throttle_reason)
{
if (ctx && psc->f && psc->f->base.version >= 4) {
psc->f->flush_with_flags(ctx, draw->driDrawable, flags, throttle_reason);
if (ctx) {
dri_flush(ctx, draw->driDrawable, flags, throttle_reason);
} else {
if (flags & __DRI2_FLUSH_CONTEXT)
glFlush();
if (psc->f)
psc->f->flush(draw->driDrawable);
dri_flush_drawable(draw->driDrawable);
dri2Throttle(psc, draw, throttle_reason);
}
@ -519,8 +518,7 @@ dri2_copy_drawable(struct dri2_drawable *priv, int dest, int src)
xrect.width = priv->width;
xrect.height = priv->height;
if (psc->f)
psc->f->flush(priv->driDrawable);
dri_flush_drawable(priv->driDrawable);
region = XFixesCreateRegion(psc->base.dpy, &xrect, 1);
DRI2CopyRegion(psc->base.dpy, priv->base.xDrawable, region, dest, src);
@ -795,16 +793,12 @@ dri2InvalidateBuffers(Display *dpy, XID drawable)
{
__GLXDRIdrawable *pdraw =
dri2GetGlxDrawableFromXDrawableId(dpy, drawable);
struct dri2_screen *psc;
struct dri2_drawable *pdp = (struct dri2_drawable *) pdraw;
if (!pdraw)
return;
psc = (struct dri2_screen *) pdraw->psc;
if (psc->f && psc->f->base.version >= 3 && psc->f->invalidate)
psc->f->invalidate(pdp->driDrawable);
dri_invalidate_drawable(pdp->driDrawable);
}
static void
@ -878,7 +872,6 @@ dri2BindExtensions(struct dri2_screen *psc, struct glx_display * priv,
}
static const struct dri_extension_match exts[] = {
{ __DRI2_FLUSH, 1, offsetof(struct dri2_screen, f), true },
{ __DRI2_CONFIG_QUERY, 1, offsetof(struct dri2_screen, config), true },
{ __DRI2_THROTTLE, 1, offsetof(struct dri2_screen, throttle), true },
{ __DRI2_INTEROP, 1, offsetof(struct dri2_screen, interop), true },

1
src/glx/dri2_priv.h
View file

@ -45,7 +45,6 @@ struct dri2_screen {
__DRIscreen *driScreen;
__GLXDRIscreen vtable;
const __DRI2flushExtension *f;
const __DRI2configQueryExtension *config;
const __DRI2throttleExtension *throttle;
const __DRI2interopExtension *interop;

19
src/glx/dri3_glx.c
View file

@ -160,7 +160,6 @@ dri3_destroy_context(struct glx_context *context)
static Bool
dri3_bind_context(struct glx_context *context, GLXDrawable draw, GLXDrawable read)
{
struct dri3_screen *psc = (struct dri3_screen *) context->psc;
struct dri3_drawable *pdraw, *pread;
__DRIdrawable *dri_draw = NULL, *dri_read = NULL;
@ -183,9 +182,9 @@ dri3_bind_context(struct glx_context *context, GLXDrawable draw, GLXDrawable rea
return GLXBadContext;
if (dri_draw)
psc->f->invalidate(dri_draw);
dri_invalidate_drawable(dri_draw);
if (dri_read && dri_read != dri_draw)
psc->f->invalidate(dri_read);
dri_invalidate_drawable(dri_read);
return Success;
}
@ -475,7 +474,7 @@ dri3_flush_front_buffer(__DRIdrawable *driDrawable, void *loaderPrivate)
loader_dri3_flush(draw, __DRI2_FLUSH_DRAWABLE, __DRI2_THROTTLE_FLUSHFRONT);
psc->f->invalidate(driDrawable);
dri_invalidate_drawable(driDrawable);
loader_dri3_wait_gl(draw);
}
@ -637,12 +636,9 @@ dri3_bind_tex_image(__GLXDRIdrawable *base,
{
struct glx_context *gc = __glXGetCurrentContext();
struct dri3_drawable *pdraw = (struct dri3_drawable *) base;
struct dri3_screen *psc;
if (pdraw != NULL) {
psc = (struct dri3_screen *) base->psc;
psc->f->invalidate(pdraw->loader_drawable.dri_drawable);
dri_invalidate_drawable(pdraw->loader_drawable.dri_drawable);
XSync(gc->currentDpy, false);
@ -702,7 +698,6 @@ dri3_bind_extensions(struct dri3_screen *psc, struct glx_display * priv,
}
static const struct dri_extension_match exts[] = {
{ __DRI2_FLUSH, 1, offsetof(struct dri3_screen, f), true },
{ __DRI_IMAGE, 1, offsetof(struct dri3_screen, image), true },
{ __DRI2_INTEROP, 1, offsetof(struct dri3_screen, interop), true },
{ __DRI2_CONFIG_QUERY, 1, offsetof(struct dri3_screen, config), true },
@ -852,11 +847,6 @@ dri3_create_screen(int screen, struct glx_display * priv, bool driver_name_is_in
goto handle_error;
}
if (!psc->f || psc->f->base.version < 4) {
ErrorMessageF("Version 4 or later of flush extension not found\n");
goto handle_error;
}
if (psc->fd_render_gpu != psc->fd_display_gpu && psc->image->base.version < 9) {
ErrorMessageF("Different GPU, but image extension version 9 or later not found\n");
goto handle_error;
@ -867,7 +857,6 @@ dri3_create_screen(int screen, struct glx_display * priv, bool driver_name_is_in
goto handle_error;
}
psc->loader_dri3_ext.flush = psc->f;
psc->loader_dri3_ext.image = psc->image;
psc->loader_dri3_ext.config = psc->config;

1
src/glx/dri3_priv.h
View file

@ -80,7 +80,6 @@ struct dri3_screen {
__DRIscreen *driScreenRenderGPU;
const __DRIimageExtension *image;
const __DRI2flushExtension *f;
const __DRI2configQueryExtension *config;
const __DRI2interopExtension *interop;
const __DRIconfig **driver_configs;

7
src/glx/drisw_glx.c
View file

@ -446,11 +446,11 @@ drisw_bind_context(struct glx_context *context, GLXDrawable draw, GLXDrawable re
pdraw ? pdraw->driDrawable : NULL,
pread ? pread->driDrawable : NULL))
return GLXBadContext;
if (psc->f) {
if (psc->kopper) {
if (pdraw)
psc->f->invalidate(pdraw->driDrawable);
dri_invalidate_drawable(pdraw->driDrawable);
if (pread && (!pdraw || pread->driDrawable != pdraw->driDrawable))
psc->f->invalidate(pread->driDrawable);
dri_invalidate_drawable(pread->driDrawable);
}
return Success;
@ -795,7 +795,6 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions)
/* FIXME: Figure out what other extensions can be ported here from dri2. */
static const struct dri_extension_match exts[] = {
{ __DRI2_FLUSH, 1, offsetof(struct drisw_screen, f), true },
{ __DRI2_CONFIG_QUERY, 1, offsetof(struct drisw_screen, config), true },
};
loader_bind_extensions(psc, exts, ARRAY_SIZE(exts), extensions);

1
src/glx/drisw_priv.h
View file

@ -39,7 +39,6 @@ struct drisw_screen
__DRIscreen *driScreen;
__GLXDRIscreen vtable;
const __DRI2flushExtension *f;
const __DRI2configQueryExtension *config;
const __DRIconfig **driver_configs;