mesa/ff_shader: Fix sampler state reading
authorPauli Nieminen <pauli.nieminen@linux.intel.com>
Tue, 12 Jun 2012 18:38:53 +0000 (21:38 +0300)
committerEric Anholt <eric@anholt.net>
Wed, 1 Aug 2012 22:31:17 +0000 (15:31 -0700)
commitcae76368523b2dd25f26069b9872a8993384fa57
treec87d71bd4a10df833d32c8e7197a0f0ae1a1c227
parent6f6bd8aedcf2b2f0e1ca9a1fa7ded1cb1f5a88ed
mesa/ff_shader: Fix sampler state reading

Fixed function fragment shader generator was incorrectly read texture
sampling state directly from texture object. To make sure that
ARB_sampler_object works correctly shader generator has to use the
bound sampler if one exist.

Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/mesa/main/ff_fragment_shader.cpp