st/mesa: fix glDrawPixels with a texture
The samplers for DrawPixels data and the pixel map are assigned to slots which don't overlap with the existing sampler slots. The texture coordinates for the user texture are uploaded as a constant. Reviewed-by:Dave Airlie <airlied@redhat.com> Reviewed-by:
Brian Paul <brianp@vmware.com> Tested-by:
Brian Paul <brianp@vmware.com>
- src/mesa/state_tracker/st_cb_drawpixels.c 42 additions, 10 deletionssrc/mesa/state_tracker/st_cb_drawpixels.c
- src/mesa/state_tracker/st_cb_drawpixels.h 3 additions, 1 deletionsrc/mesa/state_tracker/st_cb_drawpixels.h
- src/mesa/state_tracker/st_cb_drawpixels_shader.c 39 additions, 16 deletionssrc/mesa/state_tracker/st_cb_drawpixels_shader.c
- src/mesa/state_tracker/st_program.c 23 additions, 2 deletionssrc/mesa/state_tracker/st_program.c
- src/mesa/state_tracker/st_program.h 4 additions, 0 deletionssrc/mesa/state_tracker/st_program.h