mesa: Rename CoordReplaceBits back to CoordReplace.

It used to be called like that and fits better with 80 columns.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>

diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c
index 4c4bb09059054344218347dcd24d26c0c9ca2af0..39abe1b293d2a28d5ef5acd5af7855fbe11d4ead 100644 (file)
--- a/src/mesa/drivers/dri/i915/i915_state.c
+++ b/src/mesa/drivers/dri/i915/i915_state.c
@@ -657,7 +657,7 @@ i915_update_sprite_point_enable(struct gl_context *ctx)
 
    /* _NEW_POINT */
    if (ctx->Point.PointSprite)
-      coord_replace_bits = ctx->Point.CoordReplaceBits;
+      coord_replace_bits = ctx->Point.CoordReplace;
 
    GLuint tex_coord_unit_bits =
       (GLuint)((inputsRead & VARYING_BITS_TEX_ANY) >> VARYING_SLOT_TEX0);

diff --git a/src/mesa/drivers/dri/i965/brw_sf.c b/src/mesa/drivers/dri/i965/brw_sf.c
index bbfa2c699f8a3e0a621db5e9d6ece119ebc098bf..dff3461d7fe50c2b903fd5aa49a2313bc0bc3c04 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_sf.c
+++ b/src/mesa/drivers/dri/i965/brw_sf.c
@@ -190,7 +190,7 @@ brw_upload_sf_prog(struct brw_context *brw)
    /* _NEW_POINT */
    key.do_point_sprite = ctx->Point.PointSprite;
    if (key.do_point_sprite) {
-      key.point_sprite_coord_replace = ctx->Point.CoordReplaceBits & 0xff;
+      key.point_sprite_coord_replace = ctx->Point.CoordReplace & 0xff;
    }
    if (brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(VARYING_SLOT_PNTC))
       key.do_point_coord = 1;

diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index fb52990e05d6ad32704f49cd1ecb437e91d38f3d..e9a1b6d148bde84c11a21e3ee4e40e73f2dd4507 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -329,7 +329,7 @@ brw_vs_populate_key(struct brw_context *brw,
 
    /* _NEW_POINT */
    if (brw->gen < 6 && ctx->Point.PointSprite) {
-      key->point_coord_replace = ctx->Point.CoordReplaceBits & 0xff;
+      key->point_coord_replace = ctx->Point.CoordReplace & 0xff;
    }
 
    /* _NEW_TEXTURE */

diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c
index 309464fc9a9807caa4ca5676423a04c53e019ba3..32dd8c49150f09a069b07ee119de77516a9004e8 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -214,7 +214,7 @@ calculate_attr_overrides(const struct brw_context *brw,
       if (drawing_points) {
          if (brw->ctx.Point.PointSprite &&
              (attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7) &&
-             (brw->ctx.Point.CoordReplaceBits & (1u << (attr - VARYING_SLOT_TEX0)))) {
+             (brw->ctx.Point.CoordReplace & (1u << (attr - VARYING_SLOT_TEX0)))) {
             point_sprite = true;
          }
 

diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index e2a56d5e07b79c13c08558db4c0f412df84b6b40..f0693ba35aaea37dda7acd67ed47400186c9e1f4 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -1852,7 +1852,7 @@ static void r200Enable( struct gl_context *ctx, GLenum cap, GLboolean state )
       R200_STATECHANGE( rmesa, spr );
       if ( state ) {
         rmesa->hw.spr.cmd[SPR_POINT_SPRITE_CNTL] |= R200_PS_GEN_TEX_MASK &
-            (ctx->Point.CoordReplaceBits << R200_PS_GEN_TEX_0_SHIFT);
+            (ctx->Point.CoordReplace << R200_PS_GEN_TEX_0_SHIFT);
       } else {
         rmesa->hw.spr.cmd[SPR_POINT_SPRITE_CNTL] &= ~R200_PS_GEN_TEX_MASK;
       }

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 6f39cb0610ba820fcafef1048cc39977a7edd577..52a8ba6336366dae5b31226b31332bc002888fc7 100644 (file)
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1247,7 +1247,7 @@ _mesa_PopAttrib(void)
                   GLuint u;
                   for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
                      _mesa_TexEnvi(GL_POINT_SPRITE_NV, GL_COORD_REPLACE_NV,
-                                   !!(point->CoordReplaceBits & (1u << u)));
+                                   !!(point->CoordReplace & (1u << u)));
                   }
                   _mesa_set_enable(ctx, GL_POINT_SPRITE_NV,point->PointSprite);
                   if (ctx->Extensions.NV_point_sprite)

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index adf71dc58d625d53c3cd86430f36a344ac22ea8e..ecdd0184c86eb40ca4a3272b2aa3b590286d0845 100644 (file)
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -243,7 +243,7 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key )
         key->unit[i].texunit_really_enabled = 1;
 
       if (ctx->Point.PointSprite)
-        if (ctx->Point.CoordReplaceBits & (1u << i))
+        if (ctx->Point.CoordReplace & (1u << i))
            key->unit[i].coord_replace = 1;
 
       if (ctx->Texture._TexMatEnabled & ENABLE_TEXMAT(i))

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 7a35953c38a4ff0d4ac3702ae0945273640212eb..b86a0eead0f2046446f96f7df60059c2b70a4431 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -756,7 +756,7 @@ struct gl_point_attrib
    GLboolean SmoothFlag;       /**< True if GL_POINT_SMOOTH is enabled */
    GLboolean _Attenuated;      /**< True if Params != [1, 0, 0] */
    GLboolean PointSprite;      /**< GL_NV/ARB_point_sprite */
-   GLbitfield CoordReplaceBits; /**< GL_ARB_point_sprite*/
+   GLbitfield CoordReplace;     /**< GL_ARB_point_sprite*/
    GLenum SpriteRMode;         /**< GL_NV_point_sprite (only!) */
    GLenum SpriteOrigin;                /**< GL_ARB_point_sprite */
 };

diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index 6bb1ce69a9dab5505a55e880cddcea1b2723c411..2d62e73c126fcbc8b48d103fd4ebcf9b8edbadef 100644 (file)
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -251,5 +251,5 @@ _mesa_init_point(struct gl_context *ctx)
 
    ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */
    ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */
-   ctx->Point.CoordReplaceBits = 0; /* GL_ARB/NV_point_sprite */
+   ctx->Point.CoordReplace = 0; /* GL_ARB/NV_point_sprite */
 }

diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 1aa0d6c410a2687670d02897279989a6cc35742f..de49566ec42cb66f44b13fda5d0c72c0d3ce3942 100644 (file)
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -464,13 +464,13 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
           * but that's what the spec calls for.
           */
          if (iparam0 == GL_TRUE) {
-            if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
+            if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
                return;
-            ctx->Point.CoordReplaceBits |= (1u << ctx->Texture.CurrentUnit);
+            ctx->Point.CoordReplace |= (1u << ctx->Texture.CurrentUnit);
          } else if (iparam0 == GL_FALSE) {
-            if (~(ctx->Point.CoordReplaceBits) & (1u << ctx->Texture.CurrentUnit))
+            if (~(ctx->Point.CoordReplace) & (1u << ctx->Texture.CurrentUnit))
                return;
-            ctx->Point.CoordReplaceBits &= ~(1u << ctx->Texture.CurrentUnit);
+            ctx->Point.CoordReplace &= ~(1u << ctx->Texture.CurrentUnit);
          } else {
             _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
             return;
@@ -677,7 +677,7 @@ _mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
          return;
       }
       if (pname == GL_COORD_REPLACE_NV) {
-         if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
+         if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
             *params = 1.0f;
          else
             *params = 0.0f;
@@ -741,7 +741,7 @@ _mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
          return;
       }
       if (pname == GL_COORD_REPLACE_NV) {
-         if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
+         if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
             *params = GL_TRUE;
          else
             *params = GL_FALSE;

diff --git a/src/mesa/state_tracker/st_atom_rasterizer.c b/src/mesa/state_tracker/st_atom_rasterizer.c
index 37a35982caf78c3da8b7db2fdb10eb4af6372b8d..d17ce3029585a6c014223f618fee3184d3907e7c 100644 (file)
--- a/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -180,7 +180,7 @@ static void update_raster_state( struct st_context *st )
        * that we need to replace GENERIC[k] attrib with an automatically
        * computed texture coord.
        */
-      raster->sprite_coord_enable = ctx->Point.CoordReplaceBits &
+      raster->sprite_coord_enable = ctx->Point.CoordReplace &
          ((1u << MAX_TEXTURE_COORD_UNITS) - 1);
       if (!st->needs_texcoord_semantic &&
           fragProg->Base.InputsRead & VARYING_BIT_PNTC) {

diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index 82128508de206af831a44314a79448121f05db9f..de5cd6921705f3e2e6c46b7f0e6f1aa23f299d78 100644 (file)
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -140,7 +140,7 @@ sprite_point(struct gl_context *ctx, const SWvertex *vert)
             /* a texcoord attribute */
             const GLuint u = attr - VARYING_SLOT_TEX0;
             assert(u < MAX_TEXTURE_COORD_UNITS);
-            if (ctx->Point.CoordReplaceBits & (1u << u)) {
+            if (ctx->Point.CoordReplace & (1u << u)) {
                tCoords[numTcoords++] = attr;
 
                if (ctx->Point.SpriteRMode == GL_ZERO)