i915: Map sampler indices to texture units correctly for fragment shaders.
authorEric Anholt <eric@anholt.net>
Tue, 20 Apr 2010 19:26:49 +0000 (12:26 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 20 Apr 2010 19:46:23 +0000 (12:46 -0700)
commit1407daf9bc9e0452a171aaca2ab8e389ccca5462
tree65682a6795cb33c86f665586e95bccec177a71e1
parentac3529eec4d08c2d9633d7b1bba8413cc507f3c1
i915: Map sampler indices to texture units correctly for fragment shaders.

Fixes hang with "gst-launch-0.10 videotestsrc ! video/x-raw-rgb !
glupload !  gleffects effect=heat ! glimagesink" which uses 2 samplers
pointing at GL_TEXTURE1 and GL_TEXTURE2, and piglit
glsl-fs-sampler-numbering.
src/mesa/drivers/dri/i915/i915_fragprog.c