From a09c8b577f6bfcf5e5a4008120ebdbcc1a94df35 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 25 Jul 2024 08:44:18 -0400 Subject: [PATCH] glx: delete the only users of __DRItexBufferExtension::setTexBuffer this is pointless since there's only one implementation of DRI_TEX_BUFFER Reviewed-by: Adam Jackson Part-of: --- src/glx/dri2_glx.c | 16 ++++------------ src/glx/drisw_glx.c | 16 ++++------------ 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index dc69b1d38ee..1697a213615 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -818,18 +818,10 @@ dri2_bind_tex_image(__GLXDRIdrawable *base, if (pdraw != NULL) { psc = (struct dri2_screen *) base->psc; - if (psc->texBuffer->base.version >= 2 && - psc->texBuffer->setTexBuffer2 != NULL) { - psc->texBuffer->setTexBuffer2(gc->driContext, - pdraw->base.textureTarget, - pdraw->base.textureFormat, - pdraw->driDrawable); - } - else { - psc->texBuffer->setTexBuffer(gc->driContext, - pdraw->base.textureTarget, - pdraw->driDrawable); - } + psc->texBuffer->setTexBuffer2(gc->driContext, + pdraw->base.textureTarget, + pdraw->base.textureFormat, + pdraw->driDrawable); } } diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index daf23af493a..91e96173ab8 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -488,18 +488,10 @@ drisw_bind_tex_image(__GLXDRIdrawable *base, if (!psc->texBuffer) return; - if (psc->texBuffer->base.version >= 2 && - psc->texBuffer->setTexBuffer2 != NULL) { - psc->texBuffer->setTexBuffer2(gc->driContext, - pdraw->base.textureTarget, - pdraw->base.textureFormat, - pdraw->driDrawable); - } - else { - psc->texBuffer->setTexBuffer(gc->driContext, - pdraw->base.textureTarget, - pdraw->driDrawable); - } + psc->texBuffer->setTexBuffer2(gc->driContext, + pdraw->base.textureTarget, + pdraw->base.textureFormat, + pdraw->driDrawable); } }