fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 17:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: Separate states for samplers and sampler views.

Browse source 
And reset nregs on updates. Prevents eventual assertion failure.
This commit is contained in:
Michel Dänzer 2012-05-14 15:32:02 +02:00 • committed by Michel Dänzer
parent 36abadd0db
commit 23e4fe2a53
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/radeonsi/evergreen_state.c
View file

@ -1274,7 +1274,7 @@ static void evergreen_set_ps_sampler_view(struct pipe_context *ctx, unsigned cou
{
struct r600_context *rctx = (struct r600_context *)ctx;
struct si_pipe_sampler_view **resource = (struct si_pipe_sampler_view **)views;
struct r600_pipe_state *rstate = &rctx->ps_samplers.rstate;
struct r600_pipe_state *rstate = &rctx->ps_samplers.views_state;
struct r600_resource *bo;
int i;
int has_depth = 0;
@ -1312,6 +1312,7 @@ static void evergreen_set_ps_sampler_view(struct pipe_context *ctx, unsigned cou
pipe_sampler_view_reference((struct pipe_sampler_view **)&rctx->ps_samplers.views[i], NULL);
}
rstate->nregs = 0;
va = r600_resource_va(ctx->screen, (void *)bo);
r600_pipe_state_add_reg(rstate, R_00B040_SPI_SHADER_USER_DATA_PS_4, va, bo, RADEON_USAGE_READ);
r600_pipe_state_add_reg(rstate, R_00B044_SPI_SHADER_USER_DATA_PS_5, va >> 32, NULL, 0);
@ -1326,7 +1327,7 @@ static void evergreen_bind_ps_sampler(struct pipe_context *ctx, unsigned count,
{
struct r600_context *rctx = (struct r600_context *)ctx;
struct si_pipe_sampler_state **rstates = (struct si_pipe_sampler_state **)states;
struct r600_pipe_state *rstate = &rctx->ps_samplers.rstate;
struct r600_pipe_state *rstate = &rctx->ps_samplers.samplers_state;
struct r600_resource *bo;
uint64_t va;
char *ptr;
@ -1348,6 +1349,7 @@ static void evergreen_bind_ps_sampler(struct pipe_context *ctx, unsigned count,
rctx->ws->buffer_unmap(bo->cs_buf);
rstate->nregs = 0;
va = r600_resource_va(ctx->screen, (void *)bo);
r600_pipe_state_add_reg(rstate, R_00B038_SPI_SHADER_USER_DATA_PS_2, va, bo, RADEON_USAGE_READ);
r600_pipe_state_add_reg(rstate, R_00B03C_SPI_SHADER_USER_DATA_PS_3, va >> 32, NULL, 0);

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

@ -203,7 +203,8 @@ struct si_pipe_shader {
#define NUM_TEX_UNITS 16
struct r600_textures_info {
struct r600_pipe_state rstate;
struct r600_pipe_state views_state;
struct r600_pipe_state samplers_state;
struct si_pipe_sampler_view *views[NUM_TEX_UNITS];
struct si_pipe_sampler_state *samplers[NUM_TEX_UNITS];
unsigned n_views;