summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/enable.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-05-10 08:20:04 -0700
committerIan Romanick <idr@us.ibm.com>2007-05-10 08:20:42 -0700
commitc9e723e5013443df984cb3987ffa3a9ba3384b89 (patch)
tree51b0ba50273f963b9527d45c296e405e9e841d27 /src/mesa/main/enable.c
parent87a980a795b29c5114c07a74aa5d95b6e7a7f971 (diff)
Convert "bit" parameters to GLbitfield. Fix cut-and-paste bug in _mesa_IsEnabled
These changes are based on patch review comments from Brian Paul, Alan Hourihane, and vehemens.
Diffstat (limited to 'src/mesa/main/enable.c')
-rw-r--r--src/mesa/main/enable.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index a1067317697..1cc84465922 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -194,7 +194,7 @@ _mesa_DisableClientState( GLenum cap )
* Helper function to enable or disable a texture target.
*/
static GLboolean
-enable_texture(GLcontext *ctx, GLboolean state, GLuint bit)
+enable_texture(GLcontext *ctx, GLboolean state, GLbitfield bit)
{
const GLuint curr = ctx->Texture.CurrentUnit;
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
@@ -981,7 +981,7 @@ _mesa_Disable( GLenum cap )
* Helper function to determine whether a texture target is enabled.
*/
static GLboolean
-is_texture_enabled(GLcontext *ctx, GLuint bit)
+is_texture_enabled(GLcontext *ctx, GLbitfield bit)
{
const struct gl_texture_unit *const texUnit =
&ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -1109,7 +1109,7 @@ _mesa_IsEnabled( GLenum cap )
case GL_TEXTURE_2D:
return is_texture_enabled(ctx, TEXTURE_2D_BIT);
case GL_TEXTURE_3D:
- return is_texture_enabled(ctx, TEXTURE_2D_BIT);
+ return is_texture_enabled(ctx, TEXTURE_3D_BIT);
case GL_TEXTURE_GEN_Q:
{
const struct gl_texture_unit *texUnit;