Mesa (master): mesa: replace macro with function
Brian Paul
brianp at kemper.freedesktop.org
Sat Mar 19 21:50:26 UTC 2011
Module: Mesa
Branch: master
Commit: aafcbd2cf726e9f300d6a9cdfd62ee0fd64f85c9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aafcbd2cf726e9f300d6a9cdfd62ee0fd64f85c9
Author: Brian Paul <brianp at vmware.com>
Date: Sat Mar 19 14:17:41 2011 -0600
mesa: replace macro with function
---
src/mesa/main/fog.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index fd64bd1..4392322 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -79,12 +79,17 @@ _mesa_Fogiv(GLenum pname, const GLint *params )
}
-#define UPDATE_FOG_SCALE(ctx) do {\
- if (ctx->Fog.End == ctx->Fog.Start)\
- ctx->Fog._Scale = 1.0f;\
- else\
- ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);\
- } while(0)
+/**
+ * Update the gl_fog_attrib::_Scale field.
+ */
+static void
+update_fog_scale(struct gl_context *ctx)
+{
+ if (ctx->Fog.End == ctx->Fog.Start)
+ ctx->Fog._Scale = 1.0f;
+ else
+ ctx->Fog._Scale = 1.0f / (ctx->Fog.End - ctx->Fog.Start);
+}
void GLAPIENTRY
@@ -126,14 +131,14 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
return;
FLUSH_VERTICES(ctx, _NEW_FOG);
ctx->Fog.Start = *params;
- UPDATE_FOG_SCALE(ctx);
+ update_fog_scale(ctx);
break;
case GL_FOG_END:
if (ctx->Fog.End == *params)
return;
FLUSH_VERTICES(ctx, _NEW_FOG);
ctx->Fog.End = *params;
- UPDATE_FOG_SCALE(ctx);
+ update_fog_scale(ctx);
break;
case GL_FOG_INDEX:
if (ctx->Fog.Index == *params)
More information about the mesa-commit
mailing list