diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-11-21 23:26:13 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-11-21 23:26:13 +0000 |
| commit | 0c000ec90c8ca38bfcb94394001665d0be3112dd (patch) | |
| tree | 3eee8bc046c72ec09b5b53327799c69e91e6e247 /src | |
| parent | c34cea7de54525a337c904cf22fc026b7ca31578 (diff) | |
call gl_update_state() if needed in glGetColorTable, glGetConvolutionFilter
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/colortab.c | 6 | ||||
| -rw-r--r-- | 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 63b58e57f7..31e595bdb8 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 1641f497d8..172afd3dd2 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; |