diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-13 08:34:09 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-13 08:34:09 +0100 |
| commit | 7d894e32566b710952c44cbc71939ad1d9e2fa8d (patch) | |
| tree | 2c324c18b71f48bcb8bb2c4c35fa0fce1b02a5fb /mesalib/src/mesa/swrast/s_context.c | |
| parent | 96276c847a5c266f9f51f3ec4ece8fe3f1381c96 (diff) | |
| parent | fc72edebf875378459368c5383d9023730cbca54 (diff) | |
| download | vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.tar.gz vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.tar.bz2 vcxsrv-7d894e32566b710952c44cbc71939ad1d9e2fa8d.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_context.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c index 63350b2e7..beb915879 100644 --- a/mesalib/src/mesa/swrast/s_context.c +++ b/mesalib/src/mesa/swrast/s_context.c @@ -312,7 +312,7 @@ _swrast_update_specular_vertex_add(struct gl_context *ctx) _SWRAST_NEW_RASTERMASK| \ _NEW_LIGHT| \ _NEW_FOG | \ - _DD_NEW_SEPARATE_SPECULAR) + _MESA_NEW_SEPARATE_SPECULAR) #define _SWRAST_NEW_LINE (_SWRAST_NEW_DERIVED | \ _NEW_RENDERMODE| \ @@ -321,7 +321,7 @@ _swrast_update_specular_vertex_add(struct gl_context *ctx) _NEW_LIGHT| \ _NEW_FOG| \ _NEW_DEPTH | \ - _DD_NEW_SEPARATE_SPECULAR) + _MESA_NEW_SEPARATE_SPECULAR) #define _SWRAST_NEW_POINT (_SWRAST_NEW_DERIVED | \ _NEW_RENDERMODE | \ @@ -329,7 +329,7 @@ _swrast_update_specular_vertex_add(struct gl_context *ctx) _NEW_TEXTURE | \ _NEW_LIGHT | \ _NEW_FOG | \ - _DD_NEW_SEPARATE_SPECULAR) + _MESA_NEW_SEPARATE_SPECULAR) #define _SWRAST_NEW_TEXTURE_SAMPLE_FUNC _NEW_TEXTURE |