diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-06-11 16:34:56 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-06-11 16:34:56 +0100 |
| commit | bf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6 (patch) | |
| tree | b7b38a1e1bd5e975f77ec23ea872a97dc6963b64 /src/mesa/swrast | |
| parent | 0d2ac7a10b2904eda70794534a9a73b3f4b654cf (diff) | |
| parent | cc09724a50a4cabb68b7c5f5b8d3812d38f65391 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index f24f4fc59b2..e7c2ace32c7 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -289,6 +289,7 @@ _swrast_update_specular_vertex_add(GLcontext *ctx) #define _SWRAST_NEW_DERIVED (_SWRAST_NEW_RASTERMASK | \ + _NEW_PROGRAM_CONSTANTS | \ _NEW_TEXTURE | \ _NEW_HINT | \ _NEW_POLYGON ) |