mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

r300: stop using u_resource_vtbl::resource_destroy 

Acked-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 13:27:53 -04:00 committed by Marge Bot
parent b04044b350
commit f60a44b686
4 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r300/r300_resource.c
View File

@ -54,5 +54,5 @@ void r300_init_screen_resource_functions(struct r300_screen *r300screen)
r300screen->screen.resource_create = r300_resource_create;
r300screen->screen.resource_from_handle = r300_texture_from_handle;
r300screen->screen.resource_get_handle = r300_resource_get_handle;
r300screen->screen.resource_destroy = u_resource_destroy_vtbl;
r300screen->screen.resource_destroy = r300_resource_destroy;
}

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

@ -50,17 +50,32 @@ void r300_upload_index_buffer(struct r300_context *r300,
*start = index_offset / index_size;
}
static void r300_buffer_destroy(struct pipe_screen *screen,
struct pipe_resource *buf)
void r300_resource_destroy(struct pipe_screen *screen,
struct pipe_resource *buf)
{
struct r300_resource *rbuf = r300_resource(buf);
if (buf->target == PIPE_BUFFER) {
struct r300_resource *rbuf = r300_resource(buf);
align_free(rbuf->malloced_buffer);
align_free(rbuf->malloced_buffer);
if (rbuf->buf)
pb_reference(&rbuf->buf, NULL);
if (rbuf->buf)
pb_reference(&rbuf->buf, NULL);
FREE(rbuf);
FREE(rbuf);
} else {
struct r300_screen *rscreen = r300_screen(screen);
struct r300_resource* tex = (struct r300_resource*)buf;
if (tex->tex.cmask_dwords) {
mtx_lock(&rscreen->cmask_mutex);
if (buf == rscreen->cmask_resource) {
rscreen->cmask_resource = NULL;
}
mtx_unlock(&rscreen->cmask_mutex);
}
pb_reference(&tex->buf, NULL);
FREE(tex);
}
}
static void *
@ -148,7 +163,7 @@ static void r300_buffer_transfer_unmap( struct pipe_context *pipe,
static const struct u_resource_vtbl r300_buffer_vtbl =
{
r300_buffer_destroy, /* resource_destroy */
NULL, /* resource_destroy */
r300_buffer_transfer_map, /* transfer_map */
r300_buffer_transfer_unmap, /* transfer_unmap */
};

3
src/gallium/drivers/r300/r300_screen_buffer.h
View File

@ -41,6 +41,9 @@ void r300_upload_index_buffer(struct r300_context *r300,
unsigned index_size, unsigned *start,
unsigned count, const uint8_t *ptr);
void r300_resource_destroy(struct pipe_screen *screen,
struct pipe_resource *buf);
struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
const struct pipe_resource *templ);

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

@ -1021,23 +1021,6 @@ static void r300_texture_setup_fb_state(struct r300_surface *surf)
}
}
static void r300_texture_destroy(struct pipe_screen *screen,
struct pipe_resource* texture)
{
struct r300_screen *rscreen = r300_screen(screen);
struct r300_resource* tex = (struct r300_resource*)texture;
if (tex->tex.cmask_dwords) {
mtx_lock(&rscreen->cmask_mutex);
if (texture == rscreen->cmask_resource) {
rscreen->cmask_resource = NULL;
}
mtx_unlock(&rscreen->cmask_mutex);
}
pb_reference(&tex->buf, NULL);
FREE(tex);
}
bool r300_resource_get_handle(struct pipe_screen* screen,
struct pipe_context *ctx,
struct pipe_resource *texture,
@ -1059,7 +1042,7 @@ bool r300_resource_get_handle(struct pipe_screen* screen,
static const struct u_resource_vtbl r300_texture_vtbl =
{
r300_texture_destroy, /* resource_destroy */
NULL, /* resource_destroy */
r300_texture_transfer_map, /* transfer_map */
r300_texture_transfer_unmap, /* transfer_unmap */
};