mesa: Remove the now unused CoordsReplace array.
authorMathias Fröhlich <mathias.froehlich@web.de>
Sun, 22 May 2016 12:10:19 +0000 (14:10 +0200)
committerMathias Fröhlich <mathias.froehlich@web.de>
Thu, 16 Jun 2016 03:50:53 +0000 (05:50 +0200)
Now that all users are converted, remove the array.

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>
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/texenv.c

index 9aca64510cf8c6358ad918975f70a946016918ea..7a35953c38a4ff0d4ac3702ae0945273640212eb 100644 (file)
@@ -756,7 +756,6 @@ 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 */
-   GLboolean CoordReplace[MAX_TEXTURE_COORD_UNITS]; /**< GL_ARB_point_sprite*/
    GLbitfield CoordReplaceBits; /**< GL_ARB_point_sprite*/
    GLenum SpriteRMode;         /**< GL_NV_point_sprite (only!) */
    GLenum SpriteOrigin;                /**< GL_ARB_point_sprite */
index 3fbd5d3046b6cf21d297e54cd7efc9e60477d3a0..6bb1ce69a9dab5505a55e880cddcea1b2723c411 100644 (file)
@@ -225,8 +225,6 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params)
 void
 _mesa_init_point(struct gl_context *ctx)
 {
-   GLuint i;
-
    ctx->Point.SmoothFlag = GL_FALSE;
    ctx->Point.Size = 1.0;
    ctx->Point.Params[0] = 1.0;
@@ -253,8 +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 */
-   for (i = 0; i < ARRAY_SIZE(ctx->Point.CoordReplace); i++) {
-      ctx->Point.CoordReplace[i] = GL_FALSE; /* GL_ARB/NV_point_sprite */
-   }
    ctx->Point.CoordReplaceBits = 0; /* GL_ARB/NV_point_sprite */
 }
index 2cf322d1e1a19c194d9427051d9f2e65ce95f9b4..1aa0d6c410a2687670d02897279989a6cc35742f 100644 (file)
@@ -467,12 +467,10 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
             if (ctx->Point.CoordReplaceBits & (1u << ctx->Texture.CurrentUnit))
                return;
             ctx->Point.CoordReplaceBits |= (1u << ctx->Texture.CurrentUnit);
-            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = GL_TRUE;
          } else if (iparam0 == GL_FALSE) {
             if (~(ctx->Point.CoordReplaceBits) & (1u << ctx->Texture.CurrentUnit))
                return;
             ctx->Point.CoordReplaceBits &= ~(1u << ctx->Texture.CurrentUnit);
-            ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = GL_FALSE;
          } else {
             _mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
             return;