diff options
author | Brian Paul <[email protected]> | 2009-05-05 16:17:55 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2009-05-05 16:17:55 -0600 |
commit | c0d3761c167c2d952e92c46cf3a0e26461985ada (patch) | |
tree | 6691bdc63141732065643f198cedcfde823fd389 /src | |
parent | b3fc832ac79d89486559c018267ae846a7eff832 (diff) |
mesa: minor simplification in enable_texture(), updated comments
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/main/enable.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index f432be183cb..2e7baa48ff5 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -222,14 +222,16 @@ get_texcoord_unit(GLcontext *ctx) /** * Helper function to enable or disable a texture target. + * \param bit one of the TEXTURE_x_BIT values + * \return GL_TRUE if state is changing or GL_FALSE if no change */ static GLboolean -enable_texture(GLcontext *ctx, GLboolean state, GLbitfield bit) +enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit) { const GLuint curr = ctx->Texture.CurrentUnit; struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr]; - const GLuint newenabled = (!state) - ? (texUnit->Enabled & ~bit) : (texUnit->Enabled | bit); + const GLbitfield newenabled = state + ? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit); if (!ctx->DrawBuffer->Visual.rgbMode || texUnit->Enabled == newenabled) return GL_FALSE; |