OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a few missing ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH() calls

Browse Source
This commit is contained in:
Brian Paul
2000-02-08 01:45:22 +00:00
parent 397c9dd375
commit 73e6952ad7
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mesa/main/texstate.c
View File

@@ -1,10 +1,10 @@
/* $Id: texstate.c,v 1.6 1999/11/12 02:07:56 brianp Exp $ */ /* $Id: texstate.c,v 1.7 2000/02/08 01:45:22 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 3.3 * Version: 3.3
* *
* Copyright (C) 1999 Brian Paul All Rights Reserved. * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -165,6 +165,9 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexEnvfv");
if (target!=GL_TEXTURE_ENV) { if (target!=GL_TEXTURE_ENV) {
gl_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" ); gl_error( ctx, GL_INVALID_ENUM, "glGetTexEnvfv(target)" );
return; return;
@@ -187,6 +190,9 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexEnviv");
if (target!=GL_TEXTURE_ENV) { if (target!=GL_TEXTURE_ENV) {
gl_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" ); gl_error( ctx, GL_INVALID_ENUM, "glGetTexEnviv(target)" );
return; return;
@@ -229,6 +235,8 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params )
GLenum eparam = (GLenum) (GLint) params[0]; GLenum eparam = (GLenum) (GLint) params[0];
struct gl_texture_object *texObj; struct gl_texture_object *texObj;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexParameterfv");
if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE)) if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE))
fprintf(stderr, "texPARAM %s %s %d...\n", fprintf(stderr, "texPARAM %s %s %d...\n",
gl_lookup_enum_by_nr(target), gl_lookup_enum_by_nr(target),
@@ -408,6 +416,8 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
const struct gl_texture_image *img = NULL; const struct gl_texture_image *img = NULL;
GLuint dimensions; GLuint dimensions;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexLevelParameter");
if (level < 0 || level >= ctx->Const.MaxTextureLevels) { if (level < 0 || level >= ctx->Const.MaxTextureLevels) {
gl_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" ); gl_error( ctx, GL_INVALID_VALUE, "glGetTexLevelParameter[if]v" );
return; return;
@@ -515,6 +525,8 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
struct gl_texture_object *obj; struct gl_texture_object *obj;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexParameterfv");
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
obj = texUnit->CurrentD[1]; obj = texUnit->CurrentD[1];
@@ -583,6 +595,8 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
struct gl_texture_object *obj; struct gl_texture_object *obj;
ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetTexParameteriv");
switch (target) { switch (target) {
case GL_TEXTURE_1D: case GL_TEXTURE_1D:
obj = texUnit->CurrentD[1]; obj = texUnit->CurrentD[1];
@@ -594,7 +608,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
obj = texUnit->CurrentD[3]; obj = texUnit->CurrentD[3];
break; break;
default: default:
gl_error(ctx, GL_INVALID_ENUM, "glGetTexParameterfv(target)"); gl_error(ctx, GL_INVALID_ENUM, "glGetTexParameteriv(target)");
return; return;
} }
@@ -1269,7 +1283,7 @@ void gl_remove_texobj_from_dirty_list( struct gl_shared_state *shared,
/* /*
* This is called by gl_update_state() if the NEW_TEXTURING bit in * This is called by gl_update_state() if the NEW_TEXTURING bit in
* ctx->NewState is unit. * ctx->NewState is set.
*/ */
void gl_update_dirty_texobjs( GLcontext *ctx ) void gl_update_dirty_texobjs( GLcontext *ctx )
{ {