Mesa (main): dri: Move driCopySubBufferExtension into drisw

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6c546ece69afb304997ff7627f61cea256e6697a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c546ece69afb304997ff7627f61cea256e6697a

Author: Adam Jackson <ajax at redhat.com>
Date:   Fri May  6 10:49:04 2022 -0400

dri: Move driCopySubBufferExtension into drisw

drisw is the only consumer so rename things to make it a bit more
obvious.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16377>

---

 src/gallium/frontends/dri/dri_util.c | 16 ----------------
 src/gallium/frontends/dri/dri_util.h |  1 -
 src/gallium/frontends/dri/drisw.c    | 18 +++++++++++++++++-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index 55524c43f74..e05590b2b5d 100644
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -1029,19 +1029,3 @@ const __DRIimageDriverExtension driImageDriverExtension = {
     .getAPIMask                 = driGetAPIMask,
     .createContextAttribs       = driCreateContextAttribs,
 };
-
-/* swrast copy sub buffer entrypoint. */
-static void driCopySubBuffer(__DRIdrawable *pdp, int x, int y,
-                             int w, int h)
-{
-    assert(pdp->driScreenPriv->swrast_loader);
-
-    pdp->driScreenPriv->driver->CopySubBuffer(pdp, x, y, w, h);
-}
-
-/* for swrast only */
-const __DRIcopySubBufferExtension driCopySubBufferExtension = {
-   .base = { __DRI_COPY_SUB_BUFFER, 1 },
-
-   .copySubBuffer               = driCopySubBuffer,
-};
diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h
index 0042901afe2..1a6e22c50dc 100644
--- a/src/gallium/frontends/dri/dri_util.h
+++ b/src/gallium/frontends/dri/dri_util.h
@@ -72,7 +72,6 @@ extern const __DRIswrastExtension driSWRastExtension;
 extern const __DRIdri2Extension driDRI2Extension;
 extern const __DRIdri2Extension swkmsDRI2Extension;
 extern const __DRI2configQueryExtension dri2ConfigQueryExtension;
-extern const __DRIcopySubBufferExtension driCopySubBufferExtension;
 extern const __DRI2flushControlExtension dri2FlushControlExtension;
 
 /**
diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c
index fa6769d3b57..efdb84fc3a3 100644
--- a/src/gallium/frontends/dri/drisw.c
+++ b/src/gallium/frontends/dri/drisw.c
@@ -614,11 +614,27 @@ static const struct __DRIDriverVtableExtensionRec galliumsw_vtable = {
    .vtable = &galliumsw_driver_api,
 };
 
+/* swrast copy sub buffer entrypoint. */
+static void driswCopySubBuffer(__DRIdrawable *pdp, int x, int y,
+                               int w, int h)
+{
+   assert(pdp->driScreenPriv->swrast_loader);
+
+   pdp->driScreenPriv->driver->CopySubBuffer(pdp, x, y, w, h);
+}
+
+/* for swrast only */
+const __DRIcopySubBufferExtension driSWCopySubBufferExtension = {
+   .base = { __DRI_COPY_SUB_BUFFER, 1 },
+
+   .copySubBuffer               = driswCopySubBuffer,
+};
+
 /* This is the table of extensions that the loader will dlsym() for. */
 const __DRIextension *galliumsw_driver_extensions[] = {
     &driCoreExtension.base,
     &driSWRastExtension.base,
-    &driCopySubBufferExtension.base,
+    &driSWCopySubBufferExtension.base,
     &gallium_config_options.base,
     &galliumsw_vtable.base,
     NULL