r600: remove query/apply_opaque_metadata callbacks

Theses seem to have been radeonsi specific callbacks that are no
longer needed now that these drivers no longer share this code
path.

These callbacks were removed from radeonsi in c0d44fe0e91c.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h
index c5929c24fb03d8f037d4dadc4c3076066c6a9c93..1ae0493db2c8ac560afd93be8d931d19adc71b0a 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe_common.h
+++ b/src/gallium/drivers/r600/r600_pipe_common.h
@@ -404,14 +404,6 @@ struct r600_common_screen {
                 */
                unsigned compute_to_L2;
        } barrier_flags;
-
-       void (*query_opaque_metadata)(struct r600_common_screen *rscreen,
-                                     struct r600_texture *rtex,
-                                     struct radeon_bo_metadata *md);
-
-       void (*apply_opaque_metadata)(struct r600_common_screen *rscreen,
-                                   struct r600_texture *rtex,
-                                   struct radeon_bo_metadata *md);
 };
 
 /* This encapsulates a state or an operation which can emitted into the GPU

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index cd09debf273ceed3ad723d99701c7033e6f2da1f..3eb96852a07ba2091d07dd4ef7e68b5021c1af3a 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -519,9 +519,6 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
                /* Set metadata. */
                if (!res->b.is_shared || update_metadata) {
                        r600_texture_init_metadata(rscreen, rtex, &metadata);
-                       if (rscreen->query_opaque_metadata)
-                               rscreen->query_opaque_metadata(rscreen, rtex,
-                                                              &metadata);
 
                        rscreen->ws->buffer_set_metadata(res->buf, &metadata);
                }
@@ -1154,9 +1151,6 @@ static struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen
        rtex->resource.b.is_shared = true;
        rtex->resource.external_usage = usage;
 
-       if (rscreen->apply_opaque_metadata)
-               rscreen->apply_opaque_metadata(rscreen, rtex, &metadata);
-
        assert(rtex->surface.tile_swizzle == 0);
        return &rtex->resource.b.b;
 }
@@ -1970,9 +1964,6 @@ r600_texture_from_memobj(struct pipe_screen *screen,
        rtex->resource.b.is_shared = true;
        rtex->resource.external_usage = PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE;
 
-       if (rscreen->apply_opaque_metadata)
-               rscreen->apply_opaque_metadata(rscreen, rtex, &metadata);
-
        return &rtex->resource.b.b;
 }