diff --git a/src/gallium/auxiliary/driver_ddebug/dd_screen.c b/src/gallium/auxiliary/driver_ddebug/dd_screen.c index becc8410719..8a1bbc39d71 100644 --- a/src/gallium/auxiliary/driver_ddebug/dd_screen.c +++ b/src/gallium/auxiliary/driver_ddebug/dd_screen.c @@ -310,17 +310,6 @@ dd_screen_resource_get_param(struct pipe_screen *_screen, level, param, handle_usage, value); } -static void -dd_screen_resource_get_info(struct pipe_screen *_screen, - struct pipe_resource *resource, - unsigned *stride, - unsigned *offset) -{ - struct pipe_screen *screen = dd_screen(_screen)->screen; - - screen->resource_get_info(screen, resource, stride, offset); -} - static bool dd_screen_check_resource_capability(struct pipe_screen *_screen, struct pipe_resource *resource, @@ -652,7 +641,6 @@ ddebug_screen_create(struct pipe_screen *screen) SCR_INIT(check_resource_capability); dscreen->base.resource_get_handle = dd_screen_resource_get_handle; SCR_INIT(resource_get_param); - SCR_INIT(resource_get_info); SCR_INIT(resource_changed); dscreen->base.resource_destroy = dd_screen_resource_destroy; SCR_INIT(flush_frontbuffer); diff --git a/src/gallium/auxiliary/driver_trace/tr_screen.c b/src/gallium/auxiliary/driver_trace/tr_screen.c index 7f4b103b9dd..4e4dd203221 100644 --- a/src/gallium/auxiliary/driver_trace/tr_screen.c +++ b/src/gallium/auxiliary/driver_trace/tr_screen.c @@ -809,27 +809,6 @@ trace_screen_resource_get_param(struct pipe_screen *_screen, return result; } -static void -trace_screen_resource_get_info(struct pipe_screen *_screen, - struct pipe_resource *resource, - unsigned *stride, - unsigned *offset) -{ - struct trace_screen *tr_screen = trace_screen(_screen); - struct pipe_screen *screen = tr_screen->screen; - - trace_dump_call_begin("pipe_screen", "resource_get_info"); - trace_dump_arg(ptr, screen); - trace_dump_arg(ptr, resource); - - screen->resource_get_info(screen, resource, stride, offset); - - trace_dump_arg(uint, *stride); - trace_dump_arg(uint, *offset); - - trace_dump_call_end(); -} - static uint64_t trace_screen_resource_get_address(struct pipe_screen *_screen, struct pipe_resource *resource) @@ -1521,7 +1500,6 @@ trace_screen_create(struct pipe_screen *screen) SCR_INIT(check_resource_capability); tr_scr->base.resource_get_handle = trace_screen_resource_get_handle; SCR_INIT(resource_get_param); - SCR_INIT(resource_get_info); SCR_INIT(resource_get_address); SCR_INIT(resource_from_memobj); SCR_INIT(resource_changed); diff --git a/src/gallium/drivers/d3d12/d3d12_resource.cpp b/src/gallium/drivers/d3d12/d3d12_resource.cpp index b4452a3a3b5..4db371b49c6 100644 --- a/src/gallium/drivers/d3d12/d3d12_resource.cpp +++ b/src/gallium/drivers/d3d12/d3d12_resource.cpp @@ -955,40 +955,6 @@ static constexpr unsigned d3d12_max_planes = 3; * Get stride and offset for the given pipe resource without the need to get * a winsys_handle. */ -void -d3d12_resource_get_info(struct pipe_screen *pscreen, - struct pipe_resource *pres, - unsigned *stride, - unsigned *offset) -{ - - struct d3d12_resource* res = d3d12_resource(pres); - unsigned num_planes = util_format_get_num_planes(res->overall_format); - - pipe_resource *planes[d3d12_max_planes]; - unsigned int strides[d3d12_max_planes]; - unsigned int layer_strides[d3d12_max_planes]; - unsigned int offsets[d3d12_max_planes]; - unsigned staging_res_size = 0; - d3d12_resource_get_planes_info( - pres, - num_planes, - planes, - strides, - layer_strides, - offsets, - &staging_res_size - ); - - if(stride) { - *stride = strides[res->plane_slice]; - } - - if(offset) { - *offset = offsets[res->plane_slice]; - } -} - static bool d3d12_resource_get_param(struct pipe_screen *pscreen, struct pipe_context *context, @@ -1165,7 +1131,6 @@ d3d12_screen_resource_init(struct pipe_screen *pscreen) pscreen->resource_from_handle = d3d12_resource_from_handle; pscreen->resource_get_handle = d3d12_resource_get_handle; pscreen->resource_destroy = d3d12_resource_destroy; - pscreen->resource_get_info = d3d12_resource_get_info; pscreen->resource_get_param = d3d12_resource_get_param; pscreen->memobj_create_from_handle = d3d12_memobj_create_from_handle; diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 241b8786c99..2f994e4a1bf 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -1686,19 +1686,6 @@ llvmpipe_print_resources(void) #endif -static void -llvmpipe_get_resource_info(struct pipe_screen *screen, - struct pipe_resource *resource, - unsigned *stride, - unsigned *offset) -{ - struct llvmpipe_resource *lpr = llvmpipe_resource(resource); - - *stride = lpr->row_stride[0]; - *offset = 0; -} - - static bool llvmpipe_resource_get_param(struct pipe_screen *screen, struct pipe_context *context, @@ -1816,7 +1803,6 @@ llvmpipe_init_screen_resource_funcs(struct pipe_screen *screen) screen->memobj_create_from_handle = llvmpipe_memobj_create_from_handle; screen->memobj_destroy = llvmpipe_memobj_destroy; - screen->resource_get_info = llvmpipe_get_resource_info; screen->resource_get_param = llvmpipe_resource_get_param; screen->resource_from_user_memory = llvmpipe_resource_from_user_memory; screen->allocate_memory = llvmpipe_allocate_memory; diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 80aa9111b84..c102d73f4cd 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -1761,7 +1761,6 @@ void r600_init_screen_texture_functions(struct r600_common_screen *rscreen) rscreen->b.resource_from_handle = r600_texture_from_handle; rscreen->b.resource_get_handle = r600_texture_get_handle; rscreen->b.resource_get_param = r600_texture_get_param; - rscreen->b.resource_get_info = r600_texture_get_info; rscreen->b.resource_from_memobj = r600_texture_from_memobj; rscreen->b.memobj_create_from_handle = r600_memobj_from_handle; rscreen->b.memobj_destroy = r600_memobj_destroy; diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index 08ff7dd159d..b1a714f5625 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -2562,7 +2562,6 @@ void si_init_screen_texture_functions(struct si_screen *sscreen) sscreen->b.resource_from_handle = si_texture_from_handle; sscreen->b.resource_get_handle = si_texture_get_handle; sscreen->b.resource_get_param = si_resource_get_param; - sscreen->b.resource_get_info = si_texture_get_info; sscreen->b.resource_from_memobj = si_resource_from_memobj; sscreen->b.memobj_create_from_handle = si_memobj_from_handle; sscreen->b.memobj_destroy = si_memobj_destroy; diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h index 7eb97885f57..9b1676b0889 100644 --- a/src/gallium/include/pipe/p_screen.h +++ b/src/gallium/include/pipe/p_screen.h @@ -345,15 +345,6 @@ struct pipe_screen { unsigned handle_usage, uint64_t *value); - /** - * Get stride and offset for the given pipe resource without the need to get - * a winsys_handle. - */ - void (*resource_get_info)(struct pipe_screen *screen, - struct pipe_resource *resource, - unsigned *stride, - unsigned *offset); - /** * Mark the resource as changed so derived internal resources will be * recreated on next use.