diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-02-08 01:48:07 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-02-08 01:48:07 +0000 |
| commit | 992795f4c981e2c8aa8364a5d80776f3c7d1eb98 (patch) | |
| tree | 4a8b43bebb02f5a54372f575163ccd4973765bbd /src | |
| parent | d21f13cb05824023aa54804933d77c014d4d888a (diff) | |
added a few missing ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH() calls
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/texstate.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index b6742bcc759..72e448578a9 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.4.2.3 1999/12/21 17:22:39 keithw Exp $ */ +/* $Id: texstate.c,v 1.4.2.4 2000/02/08 01:48:07 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -145,6 +145,8 @@ void gl_GetTexEnvfv( GLcontext *ctx, GLenum target, GLenum pname, GLfloat *params ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexEnvfv"); + if (target!=GL_TEXTURE_ENV) { gl_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" ); return; @@ -166,6 +168,8 @@ void gl_GetTexEnviv( GLcontext *ctx, GLenum target, GLenum pname, GLint *params ) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexEnviv"); + if (target!=GL_TEXTURE_ENV) { gl_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" ); return; @@ -200,6 +204,8 @@ void gl_TexParameterfv( GLcontext *ctx, GLenum eparam = (GLenum) (GLint) params[0]; struct gl_texture_object *texObj; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexParameterfv"); + if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE)) fprintf(stderr, "texPARAM %s %s %d...\n", gl_lookup_enum_by_nr(target), @@ -358,6 +364,8 @@ void gl_GetTexLevelParameteriv( GLcontext *ctx, GLenum target, GLint level, const struct gl_texture_image *img = NULL; GLuint dimensions; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexLevelParameterfv"); + if (level < 0 || level >= ctx->Const.MaxTextureLevels) { gl_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" ); return; @@ -465,6 +473,8 @@ void gl_GetTexParameterfv( GLcontext *ctx, struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_object *obj; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexParameterfv"); + switch (target) { case GL_TEXTURE_1D: obj = texUnit->CurrentD[1]; @@ -532,6 +542,8 @@ void gl_GetTexParameteriv( GLcontext *ctx, struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_object *obj; + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexParameteriv"); + switch (target) { case GL_TEXTURE_1D: obj = texUnit->CurrentD[1]; |