diff options
author | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-10-18 11:59:15 +0200 |
commit | b821fe861f33d7e8a39fe4c7d885b7ff379dc476 (patch) | |
tree | 7b3c0b22d35eadf598cff3965413a96c76d5ad39 /mesalib/src/mesa/state_tracker/st_atom.c | |
parent | 56e12b1310b1b52d00bc27e919d915255af5bf03 (diff) | |
parent | b8a77c943fa53005b6cdb1ab792acf5ff0a131be (diff) | |
download | vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.gz vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.tar.bz2 vcxsrv-b821fe861f33d7e8a39fe4c7d885b7ff379dc476.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman git update 18 okt 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom.c b/mesalib/src/mesa/state_tracker/st_atom.c index 1abaf8f3e..682073ed6 100644 --- a/mesalib/src/mesa/state_tracker/st_atom.c +++ b/mesalib/src/mesa/state_tracker/st_atom.c @@ -66,6 +66,7 @@ static const struct st_tracked_state *atoms[] = &st_update_fs_constants, &st_bind_vs_ubos, &st_bind_fs_ubos, + &st_bind_gs_ubos, &st_update_pixel_transfer, /* this must be done after the vertex program update */ |