From: Brian Paul <brianp@vmware.com>
Date: Mon, 12 Mar 2012 00:31:32 +0000 (-0600)
Subject: mesa: define _MESA_NEW_SEPARATE_SPECULAR
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5edd7b8c46bbbaa59a421aa2c082374fc7dc101f;p=mesa.git

mesa: define _MESA_NEW_SEPARATE_SPECULAR

This will replace the soon-to-be-removed _DD_NEW_SEPARATE_SPECULAR flag.
Note: there's a similar composite _MESA_NEW_NEED_EYE_COORDS flag set already.

Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 9b88f993879..9b53da4b999 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3117,6 +3117,12 @@ struct gl_matrix_stack
                                            _NEW_POINT |		\
                                            _NEW_PROGRAM |	\
                                            _NEW_MODELVIEW)
+
+#define _MESA_NEW_SEPARATE_SPECULAR        (_NEW_LIGHT | \
+                                            _NEW_FOG | \
+                                            _NEW_PROGRAM)
+
+
 /*@}*/
 
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 20fd17d060c..0334f6f5aae 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -534,7 +534,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
    if (new_state & _NEW_PIXEL)
       _mesa_update_pixel( ctx, new_state );
 
-   if (new_state & _DD_NEW_SEPARATE_SPECULAR)
+   if (new_state & _MESA_NEW_SEPARATE_SPECULAR)
       update_separate_specular( ctx );
 
    if (new_state & (_NEW_BUFFERS | _NEW_VIEWPORT))
@@ -551,7 +551,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
 
 #if 0
    if (new_state & (_NEW_POINT | _NEW_LINE | _NEW_POLYGON | _NEW_LIGHT
-                    | _NEW_STENCIL | _DD_NEW_SEPARATE_SPECULAR))
+                    | _NEW_STENCIL | _MESA_NEW_SEPARATE_SPECULAR))
       update_tricaps( ctx, new_state );
 #endif