From: Brian Paul <brianp@vmware.com>
Date: Wed, 23 Mar 2011 15:04:22 +0000 (-0600)
Subject: mesa: remove _MESA_NEW_TRANSFER_STATE
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7ecb61c30c4984a8513b306b640f9d274d8ecf61;p=mesa.git

mesa: remove _MESA_NEW_TRANSFER_STATE
---

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 831774fa4b1..b558ba1a8c1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3025,8 +3025,6 @@ struct gl_matrix_stack
 
 #define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\
                                            _NEW_TEXTURE)
-
-#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL)
 /*@}*/
 
 
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 195fa234be2..da99c9b6f35 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -617,7 +617,7 @@ update_image_transfer_state(struct gl_context *ctx)
  */
 void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state )
 {
-   if (new_state & _MESA_NEW_TRANSFER_STATE)
+   if (new_state & _NEW_PIXEL)
       update_image_transfer_state(ctx);
 }
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 19c9bbabda2..118ed1d284a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -602,7 +602,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
    if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))
       _mesa_update_stencil( ctx );
 
-   if (new_state & _MESA_NEW_TRANSFER_STATE)
+   if (new_state & _NEW_PIXEL)
       _mesa_update_pixel( ctx, new_state );
 
    if (new_state & _DD_NEW_SEPARATE_SPECULAR)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 2a3037f6189..c6b8c05b100 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -55,9 +55,7 @@
  * In particular, we care about pixel transfer state and buffer state
  * (such as glReadBuffer to make sure we read from the right renderbuffer).
  */
-#define NEW_COPY_TEX_STATE (_MESA_NEW_TRANSFER_STATE | \
-                            _NEW_BUFFERS | \
-                            _NEW_PIXEL)
+#define NEW_COPY_TEX_STATE (_NEW_BUFFERS | _NEW_PIXEL)
 
 
 
@@ -2434,7 +2432,7 @@ teximage(struct gl_context *ctx, GLuint dims,
          return;   /* error was recorded */
       }
 
-      if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+      if (ctx->NewState & _NEW_PIXEL)
 	 _mesa_update_state(ctx);
 
       texObj = _mesa_get_current_tex_object(ctx, target);
@@ -2580,7 +2578,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
       return;
    }
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _NEW_PIXEL)
       _mesa_update_state(ctx);
 
    texObj = _mesa_get_current_tex_object(ctx, target);
@@ -2637,7 +2635,7 @@ texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
       return;
    }       
 
-   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+   if (ctx->NewState & _NEW_PIXEL)
       _mesa_update_state(ctx);
 
    if (subtexture_error_check(ctx, dims, target, level, xoffset, yoffset, zoffset,