fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: remove resource field from si_sampler_view

Browse source 
view->resource is redundant with view->base.texture, so get rid of it.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-02-06 16:21:52 -05:00 • committed by Marek Olšák
parent 2dec5e09e1
commit 2bf8ee34b8
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_descriptors.c
View file

@ -191,7 +191,7 @@ static void si_set_sampler_view(struct si_context *sctx,
if (view) {
struct si_sampler_view *rview =
(struct si_sampler_view*)view;
struct r600_texture *rtex = (struct r600_texture*)view->texture;
struct r600_texture *rtex = (struct r600_texture *)view->texture;
si_sampler_view_add_buffer(sctx, view->texture);

1
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -120,7 +120,6 @@ struct si_blend_color {
struct si_sampler_view {
struct pipe_sampler_view base;
struct list_head list;
struct r600_resource *resource;
/* [0..7] = image descriptor
* [4..7] = buffer descriptor */
uint32_t state[8];

3
src/gallium/drivers/radeonsi/si_state.c
View file

@ -2843,7 +2843,6 @@ si_create_sampler_view_custom(struct pipe_context *ctx,
}
pipe_resource_reference(&view->base.texture, texture);
view->resource = &tmp->resource;
if (state->format == PIPE_FORMAT_X24S8_UINT ||
state->format == PIPE_FORMAT_S8X24_UINT ||
@ -3135,7 +3134,7 @@ static void si_sampler_view_destroy(struct pipe_context *ctx,
{
struct si_sampler_view *view = (struct si_sampler_view *)state;
if (view->resource && view->resource->b.b.target == PIPE_BUFFER)
if (state->texture && state->texture->target == PIPE_BUFFER)
LIST_DELINIT(&view->list);
pipe_resource_reference(&state->texture, NULL);