From 0c000ec90c8ca38bfcb94394001665d0be3112dd Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 21 Nov 2000 23:26:13 +0000
Subject: [PATCH] call gl_update_state() if needed in glGetColorTable,
 glGetConvolutionFilter

---
 src/mesa/main/colortab.c |  6 +++++-
 src/mesa/main/convolve.c | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 63b58e57f7b..31e595bdb84 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.28 2000/11/21 23:01:23 brianp Exp $ */
+/* $Id: colortab.c,v 1.29 2000/11/21 23:26:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -689,6 +689,10 @@ _mesa_GetColorTable( GLenum target, GLenum format,
 
    ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTable");
 
+   if (ctx->NewState) {
+      gl_update_state(ctx);
+   }
+
    switch (target) {
       case GL_TEXTURE_1D:
          table = &texUnit->Current1D->Palette;
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 1641f497d87..172afd3dd26 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -1,4 +1,4 @@
-/* $Id: convolve.c,v 1.12 2000/11/21 23:01:22 brianp Exp $ */
+/* $Id: convolve.c,v 1.13 2000/11/21 23:26:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -564,6 +564,10 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *im
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetConvolutionFilter");
 
+   if (ctx->NewState) {
+      gl_update_state(ctx);
+   }
+
    if (!_mesa_is_legal_format_and_type(format, type) ||
        format == GL_COLOR_INDEX ||
        format == GL_STENCIL_INDEX ||
@@ -739,6 +743,10 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row,
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetSeparableFilter");
 
+   if (ctx->NewState) {
+      gl_update_state(ctx);
+   }
+
    if (target != GL_SEPARABLE_2D) {
       gl_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter(target)");
       return;
-- 
2.30.2