Browse Source

call gl_update_state() if needed in glGetColorTable, glGetConvolutionFilter

tags/mesa_3_5
Brian Paul 25 years ago
parent
commit
0c000ec90c
2 changed files with 14 additions and 2 deletions
  1. 5
    1
      src/mesa/main/colortab.c
  2. 9
    1
      src/mesa/main/convolve.c

+ 5
- 1
src/mesa/main/colortab.c View File

@@ -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;

+ 9
- 1
src/mesa/main/convolve.c View File

@@ -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;

Loading…
Cancel
Save