From b5012e1ee1b0172dda3921bcf12e3605b1be589b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 10 Nov 2000 18:31:04 +0000
Subject: [PATCH] replaced _NEW_IMAGING with _NEW_PIXEL

---
 src/mesa/main/convolve.c  |  8 ++++----
 src/mesa/main/histogram.c | 10 +++++-----
 src/mesa/main/state.c     |  5 ++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index f06f240aa6b..aa4af92e94c 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -1,4 +1,4 @@
-/* $Id: convolve.c,v 1.10 2000/11/10 17:45:15 brianp Exp $ */
+/* $Id: convolve.c,v 1.11 2000/11/10 18:31:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -171,7 +171,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
       }
    }
 
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -251,7 +251,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
       }
    }
 
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -875,7 +875,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
       }
    }
    
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
 
 
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 2e3f103f256..115c087022d 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -1,4 +1,4 @@
-/* $Id: histogram.c,v 1.1 2000/11/10 18:06:14 brianp Exp $ */
+/* $Id: histogram.c,v 1.2 2000/11/10 18:31:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -746,7 +746,7 @@ _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean s
       ctx->Histogram.LuminanceSize = 0xffffffff;
    }
    
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -772,7 +772,7 @@ _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
    }
 
    ctx->MinMax.Sink = sink;
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -800,7 +800,7 @@ _mesa_ResetHistogram(GLenum target)
       ctx->Histogram.Count[i][3] = 0;
    }
 
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
 
 
@@ -824,5 +824,5 @@ _mesa_ResetMinmax(GLenum target)
    ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
    ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
    ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
-   ctx->NewState |= _NEW_IMAGING;
+   ctx->NewState |= _NEW_PIXEL;
 }
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 8619f1eb63a..1cd88a7b734 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.41 2000/11/10 18:06:14 brianp Exp $ */
+/* $Id: state.c,v 1.42 2000/11/10 18:31:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -695,7 +695,7 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
 void gl_print_state( const char *msg, GLuint state )
 {
    fprintf(stderr,
-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
 	   msg,
 	   state,
 	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",
@@ -708,7 +708,6 @@ void gl_print_state( const char *msg, GLuint state )
 	   (state & _NEW_EVAL)            ? "ctx->Eval/EvalMap, " : "",
 	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",
 	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",
-	   (state & _NEW_IMAGING)         ? "ctx->Histogram/MinMax/Convolve/Seperable, ": "",
 	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",
 	   (state & _NEW_LINE)            ? "ctx->Line, " : "",
 	   (state & _NEW_FEEDBACK_SELECT) ? "ctx->Feedback/Select, " : "",
-- 
2.30.2