diff options
| author | Nicolai Hähnle <[email protected]> | 2016-02-06 16:21:52 -0500 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-03-09 15:02:27 +0100 |
| commit | 2bf8ee34b8098ebeda82e21cc93919dc923531a1 (patch) | |
| tree | f8baa10f9149bab10e95d6354300654c3417d2e4 | |
| parent | 2dec5e09e19fd7aa40daaed92c3d6193a91faa92 (diff) | |
radeonsi: remove resource field from si_sampler_view
view->resource is redundant with view->base.texture, so get rid of it.
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Michel Dänzer <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index d030baca531..37b9d68d4be 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -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); diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index 4d45e8ca3f1..736307b17a1 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -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]; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index c7be30a2967..cc19f029e6d 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -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); |