frontend/dri: replace the CopySubBuffer callback with a direct call

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19741>

diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h
index 9d9bea2..04b2889 100644 (file)
--- a/src/gallium/frontends/dri/dri_util.h
+++ b/src/gallium/frontends/dri/dri_util.h
@@ -82,9 +82,6 @@ typedef struct __DRIDriverVtableExtensionRec {
                                     int width, int height);
 
     void (*ReleaseBuffer) (__DRIscreen *screenPrivate, __DRIbuffer *buffer);
-
-    void (*CopySubBuffer)(__DRIdrawable *driDrawPriv, int x, int y,
-                          int w, int h);
 } __DRIDriverVtableExtension;
 
 struct __DRIconfigRec {

diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c
index d8eee01..c79fdc2 100644 (file)
--- a/src/gallium/frontends/dri/drisw.c
+++ b/src/gallium/frontends/dri/drisw.c
@@ -645,7 +645,6 @@ static const struct __DRIDriverVtableExtensionRec galliumsw_vtable = {
    .InitScreen = drisw_init_screen,
    .CreateBuffer = drisw_create_buffer,
    .SwapBuffers = drisw_swap_buffers,
-   .CopySubBuffer = drisw_copy_sub_buffer,
 };
 
 /* swrast copy sub buffer entrypoint. */
@@ -654,7 +653,7 @@ static void driswCopySubBuffer(__DRIdrawable *pdp, int x, int y,
 {
    assert(pdp->driScreenPriv->swrast_loader);
 
-   pdp->driScreenPriv->driver->CopySubBuffer(pdp, x, y, w, h);
+   drisw_copy_sub_buffer(pdp, x, y, w, h);
 }
 
 /* for swrast only */

diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
index a75442a..3c17ade 100644 (file)
--- a/src/gallium/frontends/dri/kopper.c
+++ b/src/gallium/frontends/dri/kopper.c
@@ -1048,7 +1048,6 @@ static const struct __DRIDriverVtableExtensionRec galliumvk_vtable = {
    .InitScreen = kopper_init_screen,
    .CreateBuffer = kopper_create_buffer,
    .SwapBuffers = kopper_swap_buffers,
-   .CopySubBuffer = NULL,
 };
 
 const __DRIextension *galliumvk_driver_extensions[] = {