diff options
Diffstat (limited to 'src/mesa/main/texstate.c')
| -rw-r--r-- | src/mesa/main/texstate.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index a99325672c4..e481bedf24f 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -1,21 +1,21 @@ -/* $Id: texstate.c,v 1.23 2000/11/19 23:10:25 brianp Exp $ */ +/* $Id: texstate.c,v 1.24 2000/11/22 07:32:17 joukj Exp $ */ /* * Mesa 3-D graphics library * Version: 3.5 - * + * * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -38,7 +38,7 @@ #include "teximage.h" #include "texstate.h" #include "texture.h" -#include "types.h" +#include "mtypes.h" #include "math/m_xform.h" #include "math/m_matrix.h" #include "swrast/swrast.h" @@ -343,7 +343,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param ) } if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE)) - fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n", + fprintf(stderr, "glTexEnv %s %s %.1f(%s) ...\n", gl_lookup_enum_by_nr(target), gl_lookup_enum_by_nr(pname), *param, @@ -608,7 +608,7 @@ _mesa_TexParameterfv( GLenum target, GLenum pname, const GLfloat *params ) ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexParameterfv"); 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(pname), eparam); @@ -1072,7 +1072,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glTexGenfv"); if (MESA_VERBOSE&(VERBOSE_API|VERBOSE_TEXTURE)) - fprintf(stderr, "texGEN %s %s %x...\n", + fprintf(stderr, "texGEN %s %s %x...\n", gl_lookup_enum_by_nr(coord), gl_lookup_enum_by_nr(pname), *(int *)params); @@ -1222,7 +1222,7 @@ _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) if (pname==GL_TEXTURE_GEN_MODE) { GLenum mode = (GLenum) (GLint) *params; switch (mode) { - case GL_OBJECT_LINEAR: + case GL_OBJECT_LINEAR: texUnit->GenModeQ = GL_OBJECT_LINEAR; texUnit->_GenBitQ = TEXGEN_OBJ_LINEAR; break; @@ -1577,7 +1577,7 @@ _mesa_ActiveTextureARB( GLenum target ) ASSERT_OUTSIDE_BEGIN_END( ctx, "glActiveTextureARB" ); if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE)) - fprintf(stderr, "glActiveTexture %s\n", + fprintf(stderr, "glActiveTexture %s\n", gl_lookup_enum_by_nr(target)); if (target >= GL_TEXTURE0_ARB && target < GL_TEXTURE0_ARB + maxUnits) { |