swrast: replace macro with inline function

diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index a511d1c9a173d9207672b0548dd56c977a06e206..46a5fa24f85985ef6a231e23bd52fbf60274fc27 100644 (file)
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -238,7 +238,20 @@ extern void
 _swrast_update_texture_samplers(GLcontext *ctx);
 
 
-#define SWRAST_CONTEXT(ctx) ((SWcontext *)ctx->swrast_context)
+/** Return SWcontext for the given GLcontext */
+static INLINE SWcontext *
+SWRAST_CONTEXT(GLcontext *ctx)
+{
+   return (SWcontext *) ctx->swrast_context;
+}
+
+/** const version of above */
+static INLINE const SWcontext *
+CONST_SWRAST_CONTEXT(const GLcontext *ctx)
+{
+   return (const SWcontext *) ctx->swrast_context;
+}
+
 
 #define RENDER_START(SWctx, GLctx)                     \
    do {                                                        \

diff --git a/src/mesa/swrast/s_fog.c b/src/mesa/swrast/s_fog.c
index b9ba265db6d45f92f7679578d6c1d6a512f291b7..77ed0cfef9611a2f27137eaf3733156686ffc950 100644 (file)
--- a/src/mesa/swrast/s_fog.c
+++ b/src/mesa/swrast/s_fog.c
@@ -164,7 +164,7 @@ else {                                                                              \
 void
 _swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span )
 {
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const SWcontext *swrast = CONST_SWRAST_CONTEXT(ctx);
    GLfloat rFog, gFog, bFog;
 
    ASSERT(swrast->_FogEnabled);
@@ -283,7 +283,7 @@ _swrast_fog_rgba_span( const GLcontext *ctx, SWspan *span )
 void
 _swrast_fog_ci_span( const GLcontext *ctx, SWspan *span )
 {
-   const SWcontext *swrast = SWRAST_CONTEXT(ctx);
+   const SWcontext *swrast = CONST_SWRAST_CONTEXT(ctx);
    const GLuint fogIndex = (GLuint) ctx->Fog.Index;
    GLuint *index = span->array->index;
 

diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c
index 1b8775bf3008fe1f5fde1b99017ecfa50f5b5474..38b5633887f4fde7d3f8e4f130d4852f7344692b 100644 (file)
--- a/src/mesa/swrast/s_texcombine.c
+++ b/src/mesa/swrast/s_texcombine.c
@@ -87,7 +87,7 @@ texture_combine( const GLcontext *ctx, GLuint unit, GLuint n,
 
    ASSERT(ctx->Extensions.EXT_texture_env_combine ||
           ctx->Extensions.ARB_texture_env_combine);
-   ASSERT(SWRAST_CONTEXT(ctx)->_AnyTextureCombine);
+   ASSERT(CONST_SWRAST_CONTEXT(ctx)->_AnyTextureCombine);
 
    /*
    printf("modeRGB 0x%x  modeA 0x%x  srcRGB1 0x%x  srcA1 0x%x  srcRGB2 0x%x  srcA2 0x%x\n",