From 7c612c49b4403edb178b45aed1b975fe0f24c4ef Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 8 Jul 2019 10:52:45 +1000 Subject: [PATCH] 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 --- src/gallium/drivers/r600/r600_pipe_common.h | 8 -------- src/gallium/drivers/r600/r600_texture.c | 9 --------- 2 files changed, 17 deletions(-) diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h index c5929c24fb0..1ae0493db2c 100644 --- 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 cd09debf273..3eb96852a07 100644 --- 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; } -- 2.30.2