diff options
| author | Brian Paul <[email protected]> | 2013-10-03 17:26:18 -0700 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-10-03 17:29:42 -0700 |
| commit | b181be626634cea2dab5d3b298a8f2e7fbbfa643 (patch) | |
| tree | ce778ed160646eb78c6b5fb45fa51d298838b8b9 /src | |
| parent | 757ec72b23bac52052c2fb98105b52699e265a24 (diff) | |
radeonsi: Fix build
Reviewed-by: Tom Stellard <[email protected]>
https://bugs.freedesktop.org/show_bug.cgi?id=70106
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index d1b8f6e3df2..adbb716fead 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2678,7 +2678,7 @@ static void si_set_ps_sampler_views(struct pipe_context *ctx, unsigned count, si_set_sampler_views(rctx, PIPE_SHADER_FRAGMENT, count, views); } -static struct si_pm4_state *si_bind_sampler_states(struct r600_context *rctx, unsigned count, +static struct si_pm4_state *si_set_sampler_states(struct r600_context *rctx, unsigned count, void **states, struct r600_textures_info *samplers, unsigned user_data_reg) @@ -2757,7 +2757,7 @@ static void si_bind_vs_sampler_states(struct pipe_context *ctx, unsigned count, struct r600_context *rctx = (struct r600_context *)ctx; struct si_pm4_state *pm4; - pm4 = si_bind_sampler_states(rctx, count, states, &rctx->samplers[PIPE_SHADER_VERTEX], + pm4 = si_set_sampler_states(rctx, count, states, &rctx->samplers[PIPE_SHADER_VERTEX], R_00B130_SPI_SHADER_USER_DATA_VS_0); si_pm4_set_state(rctx, vs_sampler, pm4); } @@ -2767,7 +2767,7 @@ static void si_bind_ps_sampler_states(struct pipe_context *ctx, unsigned count, struct r600_context *rctx = (struct r600_context *)ctx; struct si_pm4_state *pm4; - pm4 = si_bind_sampler_states(rctx, count, states, &rctx->samplers[PIPE_SHADER_FRAGMENT], + pm4 = si_set_sampler_states(rctx, count, states, &rctx->samplers[PIPE_SHADER_FRAGMENT], R_00B030_SPI_SHADER_USER_DATA_PS_0); si_pm4_set_state(rctx, ps_sampler, pm4); } |