s/_backface_sign/_BackfaceSign/

diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c
index 5d2cfb8b2bb730e4c67ea62d91553dc1670df77b..bfebb91396e11075a21e1c5cc008c491580ffdb2 100644 (file)
--- a/src/mesa/drivers/dos/dmesa.c
+++ b/src/mesa/drivers/dos/dmesa.c
@@ -605,7 +605,7 @@ static void tri_rgb_flat (GLcontext *ctx,
  m2.win[0] = v2->win[0];
  m2.win[1] = FLIP2(v2->win[1]);
  *(unsigned long *)m2.color = *(unsigned long *)v2->color;
- mga_draw_tri_rgb_flat((int)SWRAST_CONTEXT(ctx)->_backface_sign, &m0, &m1, &m2);
+ mga_draw_tri_rgb_flat((int)SWRAST_CONTEXT(ctx)->_BackfaceSign, &m0, &m1, &m2);
 }
 #endif /* MATROX */
 
@@ -660,7 +660,7 @@ static void tri_rgb_flat_zless (GLcontext *ctx,
  m2.win[1] = FLIP2(v2->win[1]);
  m2.win[2] = v2->win[2];
  *(unsigned long *)m2.color = *(unsigned long *)v2->color;
- mga_draw_tri_rgb_flat_zless((int)SWRAST_CONTEXT(ctx)->_backface_sign, &m0, &m1, &m2);
+ mga_draw_tri_rgb_flat_zless((int)SWRAST_CONTEXT(ctx)->_BackfaceSign, &m0, &m1, &m2);
 }
 #endif /* MATROX */
 
@@ -710,7 +710,7 @@ static void tri_rgb_iter (GLcontext *ctx,
  *(unsigned long *)m0.color = *(unsigned long *)v0->color;
  *(unsigned long *)m1.color = *(unsigned long *)v1->color;
  *(unsigned long *)m2.color = *(unsigned long *)v2->color;
- mga_draw_tri_rgb_iter((int)SWRAST_CONTEXT(ctx)->_backface_sign, &m0, &m1, &m2);
+ mga_draw_tri_rgb_iter((int)SWRAST_CONTEXT(ctx)->_BackfaceSign, &m0, &m1, &m2);
 }
 #endif /* MATROX */
 
@@ -770,7 +770,7 @@ static void tri_rgb_iter_zless (GLcontext *ctx,
  *(unsigned long *)m0.color = *(unsigned long *)v0->color;
  *(unsigned long *)m1.color = *(unsigned long *)v1->color;
  *(unsigned long *)m2.color = *(unsigned long *)v2->color;
- mga_draw_tri_rgb_iter_zless((int)SWRAST_CONTEXT(ctx)->_backface_sign, &m0, &m1, &m2);
+ mga_draw_tri_rgb_iter_zless((int)SWRAST_CONTEXT(ctx)->_BackfaceSign, &m0, &m1, &m2);
 }
 #endif /* MATROX */
 

diff --git a/src/mesa/swrast/s_aatritemp.h b/src/mesa/swrast/s_aatritemp.h
index ac7829ebfc6fa5bbee727782e553b4672f3d82fb..2fb66faf72c1fefcd950d5bd6bf45e58ce4ce05c 100644 (file)
--- a/src/mesa/swrast/s_aatritemp.h
+++ b/src/mesa/swrast/s_aatritemp.h
@@ -82,7 +82,7 @@
    GLfloat texWidth[MAX_TEXTURE_COORD_UNITS];
    GLfloat texHeight[MAX_TEXTURE_COORD_UNITS];
 #endif
-   GLfloat bf = SWRAST_CONTEXT(ctx)->_backface_sign;
+   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceSign;
    
    
    INIT_SPAN(span, GL_POLYGON, 0, 0, SPAN_COVERAGE);

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 6a25be68f5d86d7f02c0f9ba54827e9982f10263..9e429aef85719240d1d1bd375c661f0d20f3cbff 100644 (file)
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -135,7 +135,7 @@ _swrast_update_polygon( GLcontext *ctx )
       backface_sign = 0;
    }
 
-   SWRAST_CONTEXT(ctx)->_backface_sign = backface_sign;
+   SWRAST_CONTEXT(ctx)->_BackfaceSign = backface_sign;
 }
 
 

diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h
index 30c2315ba06fbf3ab0de85121d959557bba84e79..c699078e1668347859e09e5dfa47d8d4b06358b8 100644 (file)
--- a/src/mesa/swrast/s_context.h
+++ b/src/mesa/swrast/s_context.h
@@ -274,7 +274,7 @@ typedef struct
     */
    GLuint _RasterMask;
    GLfloat _MinMagThresh[MAX_TEXTURE_IMAGE_UNITS];
-   GLfloat _backface_sign;
+   GLfloat _BackfaceSign;
    GLboolean _PreferPixelFog;
    GLboolean _AnyTextureCombine;
 

diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index 86fe4dc1fdc3938978393bcdb32bb3248699ccb7..5af74ee3ab8d3aaa549a3e4364def4d7cc2f2219 100644 (file)
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -60,7 +60,7 @@ GLboolean _swrast_culltriangle( GLcontext *ctx,
    GLfloat fy = v2->win[1] - v0->win[1];
    GLfloat c = ex*fy-ey*fx;
 
-   if (c * SWRAST_CONTEXT(ctx)->_backface_sign > 0)
+   if (c * SWRAST_CONTEXT(ctx)->_BackfaceSign > 0)
       return 0;
 
    return 1;

diff --git a/src/mesa/swrast/s_tritemp.h b/src/mesa/swrast/s_tritemp.h
index 7e8cad6f337d474cb65983eb62c497979876406d..9180218b236fc82609f65a67d933c248538634dc 100644 (file)
--- a/src/mesa/swrast/s_tritemp.h
+++ b/src/mesa/swrast/s_tritemp.h
@@ -123,7 +123,7 @@ static void NAME(GLcontext *ctx, const SWvertex *v0,
    EdgeT eMaj, eTop, eBot;
    GLfloat oneOverArea;
    const SWvertex *vMin, *vMid, *vMax;  /* Y(vMin)<=Y(vMid)<=Y(vMax) */
-   float bf = SWRAST_CONTEXT(ctx)->_backface_sign;
+   GLfloat bf = SWRAST_CONTEXT(ctx)->_BackfaceSign;
    const GLint snapMask = ~((FIXED_ONE / (1 << SUB_PIXEL_BITS)) - 1); /* for x/y coord snapping */
    GLfixed vMin_fx, vMin_fy, vMid_fx, vMid_fy, vMax_fx, vMax_fy;