diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-16 15:47:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-16 15:47:48 +0000 |
| commit | 023dc0d653e071fa9d7acb66d81a12791f5e2ebe (patch) | |
| tree | edb06dca76d34650b7bd5039dcb5c70bf22d329c /mesalib/src | |
| parent | 4d5476d24bec19c71aced4ac2b320d1110fb5363 (diff) | |
| parent | 243edb24f5179d93c849ea326fb489d3f846db71 (diff) | |
| download | vcxsrv-023dc0d653e071fa9d7acb66d81a12791f5e2ebe.tar.gz vcxsrv-023dc0d653e071fa9d7acb66d81a12791f5e2ebe.tar.bz2 vcxsrv-023dc0d653e071fa9d7acb66d81a12791f5e2ebe.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/mesa/main/state.c | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/version.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c index 589029db5..b971cc976 100644 --- a/mesalib/src/mesa/main/state.c +++ b/mesalib/src/mesa/main/state.c @@ -582,9 +582,6 @@ _mesa_update_state_locked( GLcontext *ctx ) if (new_state & _DD_NEW_SEPARATE_SPECULAR) update_separate_specular( ctx ); - if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) - update_arrays( ctx ); - if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT)) update_viewport_matrix(ctx); @@ -620,6 +617,8 @@ _mesa_update_state_locked( GLcontext *ctx ) new_prog_state |= update_program( ctx ); } + if (new_state & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) + update_arrays( ctx ); out: new_prog_state |= update_program_constants(ctx); diff --git a/mesalib/src/mesa/main/version.h b/mesalib/src/mesa/main/version.h index 2e1d70c46..cd760beba 100644 --- a/mesalib/src/mesa/main/version.h +++ b/mesalib/src/mesa/main/version.h @@ -34,8 +34,8 @@ /* Mesa version */ #define MESA_MAJOR 7 #define MESA_MINOR 8 -#define MESA_PATCH 0 -#define MESA_VERSION_STRING "7.8" +#define MESA_PATCH 1 +#define MESA_VERSION_STRING "7.8.1" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |