fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 09:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rename ERROR macro to TE_ERROR (Gerk Huisma)

Browse source
This commit is contained in:
Brian Paul 2001-07-23 16:10:03 +00:00
parent 3c03f3232d
commit ae40b2281d
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/mesa/main/texstate.c
View file

@ -1,4 +1,4 @@
/* $Id: texstate.c,v 1.54 2001/06/18 17:26:08 brianp Exp $ */ /* $Id: texstate.c,v 1.55 2001/07/23 16:10:03 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@ -68,7 +68,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
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(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
#define ERROR(errCode, msg, value) \ #define TE_ERROR(errCode, msg, value) \
{ \ { \
char s[100]; \ char s[100]; \
sprintf(s, msg, _mesa_lookup_enum_by_nr(value)); \ sprintf(s, msg, _mesa_lookup_enum_by_nr(value)); \
@ -83,14 +83,14 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
switch (mode) { switch (mode) {
case GL_ADD: case GL_ADD:
if (!ctx->Extensions.EXT_texture_env_add) { if (!ctx->Extensions.EXT_texture_env_add) {
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
break; break;
case GL_COMBINE_EXT: case GL_COMBINE_EXT:
if (!ctx->Extensions.EXT_texture_env_combine && if (!ctx->Extensions.EXT_texture_env_combine &&
!ctx->Extensions.ARB_texture_env_combine) { !ctx->Extensions.ARB_texture_env_combine) {
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
break; break;
@ -100,7 +100,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
case GL_REPLACE: case GL_REPLACE:
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
@ -136,26 +136,26 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
break; break;
case GL_SUBTRACT_ARB: case GL_SUBTRACT_ARB:
if (!ctx->Extensions.ARB_texture_env_combine) { if (!ctx->Extensions.ARB_texture_env_combine) {
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
break; break;
case GL_DOT3_RGB_EXT: case GL_DOT3_RGB_EXT:
case GL_DOT3_RGBA_EXT: case GL_DOT3_RGBA_EXT:
if (!ctx->Extensions.EXT_texture_env_dot3) { if (!ctx->Extensions.EXT_texture_env_dot3) {
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
break; break;
case GL_DOT3_RGB_ARB: case GL_DOT3_RGB_ARB:
case GL_DOT3_RGBA_ARB: case GL_DOT3_RGBA_ARB:
if (!ctx->Extensions.ARB_texture_env_dot3) { if (!ctx->Extensions.ARB_texture_env_dot3) {
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
if (texUnit->CombineModeRGB == mode) if (texUnit->CombineModeRGB == mode)
@ -164,7 +164,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineModeRGB = mode; texUnit->CombineModeRGB = mode;
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -182,12 +182,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
break; break;
case GL_SUBTRACT_ARB: case GL_SUBTRACT_ARB:
if (!ctx->Extensions.ARB_texture_env_combine) { if (!ctx->Extensions.ARB_texture_env_combine) {
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", mode);
return; return;
} }
if (texUnit->CombineModeA == mode) if (texUnit->CombineModeA == mode)
@ -196,7 +196,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineModeA = mode; texUnit->CombineModeA = mode;
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -218,12 +218,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineSourceRGB[s] = source; texUnit->CombineSourceRGB[s] = source;
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
return; return;
} }
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -244,12 +244,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineSourceA[s] = source; texUnit->CombineSourceA[s] = source;
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", source);
return; return;
} }
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -270,12 +270,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineOperandRGB[s] = operand; texUnit->CombineOperandRGB[s] = operand;
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
return; return;
} }
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -294,12 +294,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineOperandA[pname-GL_OPERAND0_ALPHA_EXT] = operand; texUnit->CombineOperandA[pname-GL_OPERAND0_ALPHA_EXT] = operand;
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
return; return;
} }
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -317,12 +317,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
FLUSH_VERTICES(ctx, _NEW_TEXTURE); FLUSH_VERTICES(ctx, _NEW_TEXTURE);
texUnit->CombineOperandRGB[2] = operand; texUnit->CombineOperandRGB[2] = operand;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
return; return;
} }
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -339,12 +339,12 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineOperandA[2] = operand; texUnit->CombineOperandA[2] = operand;
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(param=%s)", operand);
return; return;
} }
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -372,7 +372,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineScaleShiftRGB = newshift; texUnit->CombineScaleShiftRGB = newshift;
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -400,7 +400,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->CombineScaleShiftA = newshift; texUnit->CombineScaleShiftA = newshift;
} }
else { else {
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
break; break;
@ -422,7 +422,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
texUnit->LodBias = param[0]; texUnit->LodBias = param[0];
break; break;
default: default:
ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname); TE_ERROR(GL_INVALID_ENUM, "glTexEnv(pname=%s)", pname);
return; return;
} }
} }