diff options
| author | Marek Olšák <[email protected]> | 2015-10-05 01:22:20 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-10-09 22:02:18 +0200 |
| commit | de6a004035f3de5879648f8afb4670ae82f4ad02 (patch) | |
| tree | bec0b650805bea2c763006040fa4c44969a1728d /src/mesa/state_tracker/st_program.h | |
| parent | f15bb3e633d577fe6d8d7bc2c64497c6ac4c2021 (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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Tested-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_program.h')
| -rw-r--r-- | src/mesa/state_tracker/st_program.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index 2927d542dfc..33d39f005b9 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -85,6 +85,10 @@ struct st_fp_variant struct gl_program_parameter_list *parameters; uint bitmap_sampler; + /** For glDrawPixels variants */ + unsigned drawpix_sampler; + unsigned pixelmap_sampler; + /** next in linked list */ struct st_fp_variant *next; }; |