diff options
author | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-08-17 10:55:40 +0200 |
commit | 6d3ef5c3fe5b69e59e3511202db6a66f71c2f234 (patch) | |
tree | 3830d989b529135e92edb6004aa368f287ed20c5 /mesalib/src/mesa/state_tracker/st_atom.h | |
parent | cf506c799c2281867a28ac33ac985994918bc0ba (diff) | |
parent | 5d9b8cf0e4054e774f906cde9dd6b61ceca72d44 (diff) | |
download | vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.gz vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.tar.bz2 vcxsrv-6d3ef5c3fe5b69e59e3511202db6a66f71c2f234.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom.h')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom.h b/mesalib/src/mesa/state_tracker/st_atom.h index 703bc2ab3..6c7d09fba 100644 --- a/mesalib/src/mesa/state_tracker/st_atom.h +++ b/mesalib/src/mesa/state_tracker/st_atom.h @@ -60,8 +60,9 @@ extern const struct st_tracked_state st_update_scissor; extern const struct st_tracked_state st_update_blend; extern const struct st_tracked_state st_update_msaa; extern const struct st_tracked_state st_update_sampler; -extern const struct st_tracked_state st_update_texture; +extern const struct st_tracked_state st_update_fragment_texture; extern const struct st_tracked_state st_update_vertex_texture; +extern const struct st_tracked_state st_update_geometry_texture; extern const struct st_tracked_state st_finalize_textures; extern const struct st_tracked_state st_update_fs_constants; extern const struct st_tracked_state st_update_gs_constants; |