[Mesa-dev] [PATCH] i965: Actually upload sampler state pointers for the VS unit on Gen6.

[Ian Romanick]

On 04/04/2012 05:07 PM, Kenneth Graunke wrote:
> We already program all the sampler state correctly, we just didn't give
> the GPU a pointer to it for the VS stage.  Thus, any texturing other
> than texelFetch() wouldn't work.
>
> Fixes piglit test vs-textureLod-miplevels and 99 of oglconform's
> glsl-bif-tex subtests.
>
> NOTE: This is a candidate for the 8.0 branch.
>
> Signed-off-by: Kenneth Graunke<kenneth at whitecape.org>

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

Can you cherry-pick this right away?

> ---
>   src/mesa/drivers/dri/i965/gen6_sampler_state.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> index 15cae0a..a9a9df5 100644
> --- a/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> +++ b/src/mesa/drivers/dri/i965/gen6_sampler_state.c
> @@ -41,7 +41,7 @@ upload_sampler_state_pointers(struct brw_context *brw)
>   	     GS_SAMPLER_STATE_CHANGE |
>   	     PS_SAMPLER_STATE_CHANGE |
>   	     (4 - 2));
> -   OUT_BATCH(0); /* VS */
> +   OUT_BATCH(brw->sampler.offset); /* VS */
>      OUT_BATCH(0); /* GS */
>      OUT_BATCH(brw->sampler.offset);
>      ADVANCE_BATCH();