st/mesa: fix glDrawPixels with a texture

Graphics / Mesa 3D Graphics Library / Mesa - Marek Olšák [amd.com] - 9 October 2015 15:02 UTC

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.

de6a004 st/mesa: fix glDrawPixels with a texture
src/mesa/state_tracker/st_cb_drawpixels.c | 52 ++++++++++++++++----
src/mesa/state_tracker/st_cb_drawpixels.h | 4 +-
src/mesa/state_tracker/st_cb_drawpixels_shader.c | 55 +++++++++++++++-------
src/mesa/state_tracker/st_program.c | 25 +++++++++-
src/mesa/state_tracker/st_program.h | 4 ++
5 files changed, 111 insertions(+), 29 deletions(-)

Upstream: cgit.freedesktop.org


  • Share