Attachment 87097 Details for Bug 70106 – patch to try

patch to try

si-patch.txt (text/plain), 1.57 KB, created by Brian Paul on 2013-10-04 00:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2013-10-04 00:10:03 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
>index d1b8f6e..adbb716 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);
> }

Actions: View

Attachments on bug 70106: 87097

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.