projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f15bb3e) | patch
st/mesa: fix glDrawPixels with a texture
authorMarek Olšák <marek.olsak@amd.com>
Sun, 4 Oct 2015 23:22:20 +0000 (01:22 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Fri, 9 Oct 2015 20:02:18 +0000 (22:02 +0200)
commitde6a004035f3de5879648f8afb4670ae82f4ad02
treebec0b650805bea2c763006040fa4c44969a1728dtree
parentf15bb3e633d577fe6d8d7bc2c64497c6ac4c2021commit | diff
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 diff | blob | history
src/mesa/state_tracker/st_cb_drawpixels.h diff | blob | history
src/mesa/state_tracker/st_cb_drawpixels_shader.c diff | blob | history
src/mesa/state_tracker/st_program.c diff | blob | history
src/mesa/state_tracker/st_program.h diff | blob | history