diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-04-04 16:48:21 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-04-05 18:38:31 -0700 |
| commit | edeb3976d427bf4f9c471bc5171ee507533b7e89 (patch) | |
| tree | 9d6f271f14424bf815741c9cde7f0215dc8150a6 | |
| parent | a30790a9a38dd392204c7d79ea448d5cd6001e43 (diff) | |
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.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 2a80a1e2a702228501fd298b9b176efa8c2c6258)
| -rw-r--r-- | 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 15cae0a79d..a9a9df5f8a 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(); |