From abb0ea31ca189324b5aee121f7561719cbf8275d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 5 May 2022 16:52:07 -0400 Subject: [PATCH] dri: Inline dri2InvalidateDrawable into its one caller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Mike Blumenkrantz Part-of: --- src/gallium/frontends/dri/dri2.c | 2 +- src/gallium/frontends/dri/dri_util.c | 6 ------ src/gallium/frontends/dri/dri_util.h | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/gallium/frontends/dri/dri2.c b/src/gallium/frontends/dri/dri2.c index 3cbf15927b8..fc1fe9328d5 100644 --- a/src/gallium/frontends/dri/dri2.c +++ b/src/gallium/frontends/dri/dri2.c @@ -80,7 +80,7 @@ dri2_invalidate_drawable(__DRIdrawable *dPriv) { struct dri_drawable *drawable = dri_drawable(dPriv); - dri2InvalidateDrawable(dPriv); + dPriv->dri2.stamp++; drawable->dPriv->lastStamp = drawable->dPriv->dri2.stamp; drawable->texture_mask = 0; diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c index 8d60526f45b..55524c43f74 100644 --- a/src/gallium/frontends/dri/dri_util.c +++ b/src/gallium/frontends/dri/dri_util.c @@ -860,12 +860,6 @@ const __DRI2flushControlExtension dri2FlushControlExtension = { .base = { __DRI2_FLUSH_CONTROL, 1 } }; -void -dri2InvalidateDrawable(__DRIdrawable *drawable) -{ - drawable->dri2.stamp++; -} - /* * Note: the first match is returned, which is important for formats like * __DRI_IMAGE_FORMAT_R8 which maps to both MESA_FORMAT_{R,L}_UNORM8 diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h index 6b9a71d6f16..0042901afe2 100644 --- a/src/gallium/frontends/dri/dri_util.h +++ b/src/gallium/frontends/dri/dri_util.h @@ -311,9 +311,6 @@ driGLFormatToSizedInternalGLFormat(mesa_format format); extern mesa_format driImageFormatToGLFormat(uint32_t image_format); -extern void -dri2InvalidateDrawable(__DRIdrawable *drawable); - extern const __DRIimageDriverExtension driImageDriverExtension; #endif /* _DRI_UTIL_H_ */