diff options
| author | Kenneth Graunke <[email protected]> | 2012-04-04 16:48:21 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2012-04-05 18:37:34 -0700 |
| commit | 2a80a1e2a702228501fd298b9b176efa8c2c6258 (patch) | |
| tree | c3132de97d9843812ddc448d3d923d0e7e9657f6 | |
| parent | cf68959f99f372ef1c4f647e7a7438ab478314c9 (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.
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -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 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(); |