diff options
Diffstat (limited to 'src/mesa/main/texobj.c')
| -rw-r--r-- | src/mesa/main/texobj.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index f0372237ca..f090fcd734 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,21 +1,21 @@ -/* $Id: texobj.c,v 1.34 2000/11/19 23:10:25 brianp Exp $ */ +/* $Id: texobj.c,v 1.35 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 "texobj.h" -#include "types.h" +#include "mtypes.h" #endif @@ -626,7 +626,7 @@ _mesa_BindTexture( GLenum target, GLuint texName ) ctx->NewState |= _NEW_TEXTURE; /* Pass BindTexture call to device driver */ - if (ctx->Driver.BindTexture) + if (ctx->Driver.BindTexture) (*ctx->Driver.BindTexture)( ctx, target, newTexObj ); if (oldTexObj->Name > 0) { @@ -680,7 +680,7 @@ _mesa_PrioritizeTextures( GLsizei n, const GLuint *texName, /* - * Execute glAreTexturesResident + * Execute glAreTexturesResident */ GLboolean _mesa_AreTexturesResident(GLsizei n, const GLuint *texName, @@ -690,7 +690,7 @@ _mesa_AreTexturesResident(GLsizei n, const GLuint *texName, GLboolean allResident = GL_TRUE; GLint i; - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH_WITH_RETVAL(ctx, "glAreTexturesResident", GL_FALSE); if (n < 0) { gl_error(ctx, GL_INVALID_VALUE, "glAreTexturesResident(n)"); |