KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium: remove u_resource_vtbl::resource_destroy 

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10659>
This commit is contained in:
Marek Olšák 2021-05-05 14:25:20 -04:00 committed by Marge Bot
parent f7b865f1a3
commit 9effc49569
20 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/auxiliary/util/u_transfer.c
View File

@ -98,13 +98,6 @@ u_resource( struct pipe_resource *res )
return (struct u_resource *)res;
}
void u_resource_destroy_vtbl(struct pipe_screen *screen,
struct pipe_resource *resource)
{
struct u_resource *ur = u_resource(resource);
ur->vtbl->resource_destroy(screen, resource);
}
void *u_transfer_map_vtbl(struct pipe_context *context,
struct pipe_resource *resource,
unsigned level,

6
src/gallium/auxiliary/util/u_transfer.h
View File

@ -36,9 +36,6 @@ void u_default_transfer_flush_region( struct pipe_context *pipe,
* to exist in a single driver. This is intended to be transitionary!
*/
struct u_resource_vtbl {
void (*resource_destroy)(struct pipe_screen *,
struct pipe_resource *pt);
void *(*transfer_map)(struct pipe_context *,
struct pipe_resource *resource,
unsigned level,
@ -57,9 +54,6 @@ struct u_resource {
};
void u_resource_destroy_vtbl(struct pipe_screen *screen,
struct pipe_resource *resource);
void *u_transfer_map_vtbl(struct pipe_context *context,
struct pipe_resource *resource,
unsigned level,

1
src/gallium/drivers/i915/i915_resource_buffer.c
View File

@ -112,7 +112,6 @@ i915_buffer_subdata(struct pipe_context *rm_ctx,
struct u_resource_vtbl i915_buffer_vtbl =
{
NULL,
i915_buffer_transfer_map, /* transfer_map */
i915_buffer_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/i915/i915_resource_texture.c
View File

@ -895,7 +895,6 @@ out:
struct u_resource_vtbl i915_texture_vtbl =
{
NULL, /* resource_destroy */
i915_texture_transfer_map, /* transfer_map */
i915_texture_transfer_unmap, /* transfer_unmap */
};

2
src/gallium/drivers/nouveau/nouveau_buffer.c
View File

@ -635,7 +635,6 @@ nouveau_resource_map_offset(struct nouveau_context *nv,
const struct u_resource_vtbl nouveau_buffer_vtbl =
{
NULL, /* resource_destroy */
nouveau_buffer_transfer_map, /* transfer_map */
nouveau_buffer_transfer_unmap, /* transfer_unmap */
};
@ -665,7 +664,6 @@ nouveau_user_ptr_transfer_unmap(struct pipe_context *pipe,
const struct u_resource_vtbl nouveau_user_ptr_buffer_vtbl =
{
NULL, /* resource_destroy */
nouveau_user_ptr_transfer_map, /* transfer_map */
nouveau_user_ptr_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/nouveau/nv30/nv30_miptree.c
View File

@ -403,7 +403,6 @@ nv30_miptree_transfer_unmap(struct pipe_context *pipe,
}
const struct u_resource_vtbl nv30_miptree_vtbl = {
NULL,
nv30_miptree_transfer_map,
nv30_miptree_transfer_unmap,
};

1
src/gallium/drivers/nouveau/nv50/nv50_miptree.c
View File

@ -204,7 +204,6 @@ nv50_miptree_get_handle(struct pipe_screen *pscreen,
const struct u_resource_vtbl nv50_miptree_vtbl =
{
NULL, /* resource_destroy */
nv50_miptree_transfer_map, /* transfer_map */
nv50_miptree_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
View File

@ -438,7 +438,6 @@ nvc0_miptree_select_best_modifier(struct pipe_screen *pscreen,
const struct u_resource_vtbl nvc0_miptree_vtbl =
{
NULL, /* resource_destroy */
nvc0_miptree_transfer_map, /* transfer_map */
nvc0_miptree_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/r300/r300_screen_buffer.c
View File

@ -163,7 +163,6 @@ static void r300_buffer_transfer_unmap( struct pipe_context *pipe,
static const struct u_resource_vtbl r300_buffer_vtbl =
{
NULL, /* resource_destroy */
r300_buffer_transfer_map, /* transfer_map */
r300_buffer_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/r300/r300_texture.c
View File

@ -1042,7 +1042,6 @@ bool r300_resource_get_handle(struct pipe_screen* screen,
static const struct u_resource_vtbl r300_texture_vtbl =
{
NULL, /* resource_destroy */
r300_texture_transfer_map, /* transfer_map */
r300_texture_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/r600/evergreen_compute.c
View File

@ -1317,7 +1317,6 @@ void r600_compute_global_buffer_destroy(struct pipe_screen *screen,
static const struct u_resource_vtbl r600_global_buffer_vtbl =
{
NULL, /* resource_destroy */
r600_compute_global_transfer_map, /* transfer_map */
r600_compute_global_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/r600/r600_buffer_common.c
View File

@ -563,7 +563,6 @@ void r600_buffer_subdata(struct pipe_context *ctx,
static const struct u_resource_vtbl r600_buffer_vtbl =
{
NULL, /* resource_destroy */
r600_buffer_transfer_map, /* transfer_map */
r600_buffer_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/r600/r600_texture.c
View File

@ -1520,7 +1520,6 @@ static void r600_texture_transfer_unmap(struct pipe_context *ctx,
static const struct u_resource_vtbl r600_texture_vtbl =
{
NULL, /* resource_destroy */
r600_texture_transfer_map, /* transfer_map */
r600_texture_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/radeonsi/si_buffer.c
View File

@ -569,7 +569,6 @@ static void si_buffer_subdata(struct pipe_context *ctx, struct pipe_resource *bu
}
static const struct u_resource_vtbl si_buffer_vtbl = {
NULL, /* resource_destroy */
si_buffer_transfer_map, /* transfer_map */
si_buffer_transfer_unmap, /* transfer_unmap */
};

2
src/gallium/drivers/radeonsi/si_texture.c
View File

@ -1432,7 +1432,6 @@ si_texture_create_with_modifiers(struct pipe_screen *screen,
}
static const struct u_resource_vtbl si_auxiliary_texture_vtbl = {
NULL, /* resource_destroy */
NULL, /* transfer_map */
NULL, /* transfer_unmap */
};
@ -1919,7 +1918,6 @@ static void si_texture_transfer_unmap(struct pipe_context *ctx, struct pipe_tran
}
static const struct u_resource_vtbl si_texture_vtbl = {
NULL, /* resource_destroy */
si_texture_transfer_map, /* transfer_map */
si_texture_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/svga/svga_resource_buffer.c
View File

@ -456,7 +456,6 @@ svga_resource_destroy(struct pipe_screen *screen,
struct u_resource_vtbl svga_buffer_vtbl =
{
NULL, /* resource_destroy */
svga_buffer_transfer_map, /* transfer_map */
svga_buffer_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/svga/svga_resource_texture.c
View File

@ -843,7 +843,6 @@ format_has_depth(enum pipe_format format)
struct u_resource_vtbl svga_texture_vtbl =
{
NULL, /* resource_destroy */
svga_texture_transfer_map, /* transfer_map */
svga_texture_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/vc4/vc4_resource.c
View File

@ -1121,7 +1121,6 @@ vc4_resource_screen_init(struct pipe_screen *pscreen)
pscreen->resource_create_with_modifiers =
vc4_resource_create_with_modifiers;
pscreen->resource_from_handle = vc4_resource_from_handle;
pscreen->resource_destroy = u_resource_destroy_vtbl;
pscreen->resource_get_handle = vc4_resource_get_handle;
pscreen->resource_destroy = vc4_resource_destroy;
pscreen->transfer_helper = u_transfer_helper_create(&transfer_vtbl,

1
src/gallium/drivers/virgl/virgl_buffer.c
View File

@ -78,7 +78,6 @@ void virgl_buffer_transfer_flush_region(struct pipe_context *ctx,
static const struct u_resource_vtbl virgl_buffer_vtbl =
{
NULL, /* resource_destroy */
virgl_resource_transfer_map, /* transfer_map */
virgl_buffer_transfer_unmap, /* transfer_unmap */
};

1
src/gallium/drivers/virgl/virgl_texture.c
View File

@ -304,7 +304,6 @@ static void virgl_texture_transfer_unmap(struct pipe_context *ctx,
static const struct u_resource_vtbl virgl_texture_vtbl =
{
NULL, /* resource_destroy */
virgl_texture_transfer_map, /* transfer_map */
virgl_texture_transfer_unmap, /* transfer_unmap */
};