fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 12:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: Fix sampler views for depth textures.

Browse source 
Consistently reference the flushed depth texture in the sampler view, not the
original one.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Michel Dänzer 2012-11-20 17:33:19 +01:00 • committed by Michel Dänzer
parent 3c024624fd
commit 49003a5cb6
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,6 +71,7 @@ struct r600_screen {
struct si_pipe_sampler_view {
struct pipe_sampler_view base;
struct si_resource *resource;
uint32_t state[8];
};

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

@ -2086,8 +2086,11 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
if (tmp->depth && !tmp->is_flushing_texture) {
r600_texture_depth_flush(ctx, texture, TRUE);
tmp = tmp->flushed_depth_texture;
texture = &tmp->resource.b.b;
}
view->resource = &tmp->resource;
/* not supported any more */
//endian = si_colorformat_endian_swap(format);
@ -2252,11 +2255,8 @@ static struct si_pm4_state *si_set_sampler_view(struct r600_context *rctx,
(struct pipe_sampler_view **)&samplers->views[i],
views[i]);
if (views[i]) {
struct r600_resource_texture *tex = (void *)resource[i]->base.texture;
si_pm4_add_bo(pm4, &tex->resource, RADEON_USAGE_READ);
}
if (views[i])
si_pm4_add_bo(pm4, resource[i]->resource, RADEON_USAGE_READ);
for (j = 0; j < Elements(resource[i]->state); ++j) {
si_pm4_sh_data_add(pm4, resource[i] ? resource[i]->state[j] : 0);