From: Kenneth Graunke Date: Wed, 4 Apr 2012 23:48:21 +0000 (-0700) Subject: i965: Actually upload sampler state pointers for the VS unit on Gen6. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a80a1e2a702228501fd298b9b176efa8c2c6258;p=mesa.git i965: Actually upload sampler state pointers for the VS unit on Gen6. 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 Reviewed-by: Ian Romanick --- diff --git a/src/mesa/drivers/dri/i965/gen6_sampler_state.c b/src/mesa/drivers/dri/i965/gen6_sampler_state.c index 15cae0a79db..a9a9df5f8a3 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();