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

radeonsi: Actually keep track if we are using depth textures for samplers.

Browse Source 
20-odd more piglits.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Michel Dänzer
2012-12-05 18:35:22 +01:00
committed by Michel Dänzer
parent 3c92bfe2d2
commit 51efb081f7
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/radeonsi/si_state.c
+7 -3
View File
@@ -2197,7 +2197,8 @@ static struct si_pm4_state *si_set_sampler_view(struct r600_context *rctx,
struct si_pipe_sampler_view **resource = (struct si_pipe_sampler_view **)views;
struct si_pm4_state *pm4 = CALLOC_STRUCT(si_pm4_state);
int i, j;
int has_depth = 0;
rctx->have_depth_texture = FALSE;
if (!count)
goto out;
@@ -2210,8 +2211,12 @@ 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])
if (resource[i]) {
struct r600_resource_texture *rtex =
(struct r600_resource_texture *)views[i]->texture;
rctx->have_depth_texture |= rtex->depth && !rtex->is_flushing_texture;
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);
@@ -2226,7 +2231,6 @@ static struct si_pm4_state *si_set_sampler_view(struct r600_context *rctx,
si_pm4_sh_data_end(pm4, user_data_reg, SI_SGPR_RESOURCE);
out:
rctx->have_depth_texture = has_depth;
rctx->ps_samplers.n_views = count;
return pm4;
}