diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-06-15 21:36:28 +0200 |
| commit | 008a8d8051786badb83e455bd9281103ba9a6470 (patch) | |
| tree | f99ea672d105271cb60a726fac8022ce47ea2866 /mesalib/src/mesa/state_tracker/st_program.h | |
| parent | 912e881bec8b16f2331225960645c3bdf5a8ba2d (diff) | |
| parent | e8d5e7c4bb11f7fcb0a4ba5c13f43e7929849a2f (diff) | |
| download | vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.gz vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.tar.bz2 vcxsrv-008a8d8051786badb83e455bd9281103ba9a6470.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_program.h')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_program.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_program.h b/mesalib/src/mesa/state_tracker/st_program.h index a2c56062d..bb77eb6ed 100644 --- a/mesalib/src/mesa/state_tracker/st_program.h +++ b/mesalib/src/mesa/state_tracker/st_program.h @@ -163,6 +163,7 @@ struct st_vertex_program /** Maps VARYING_SLOT_x to slot */ GLuint result_to_output[VARYING_SLOT_MAX]; + GLuint output_slot_to_attr[VARYING_SLOT_MAX]; ubyte output_semantic_name[VARYING_SLOT_MAX]; ubyte output_semantic_index[VARYING_SLOT_MAX]; GLuint num_outputs; |