From 291f00fa12a35ad2bcaa8f81309fa06b9cab6802 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathias=20Fr=C3=B6hlich?= Date: Sun, 22 May 2016 14:10:19 +0200 Subject: [PATCH] mesa: Remove the now unused CoordsReplace array. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Now that all users are converted, remove the array. Reviewed-by: Brian Paul Reviewed-by: Ian Romanick Signed-off-by: Mathias Fröhlich --- src/mesa/main/mtypes.h | 1 - src/mesa/main/points.c | 5 ----- src/mesa/main/texenv.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 9aca64510cf..7a35953c38a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -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 */ diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 3fbd5d3046b..6bb1ce69a9d 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -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 */ } diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c index 2cf322d1e1a..1aa0d6c410a 100644 --- a/src/mesa/main/texenv.c +++ b/src/mesa/main/texenv.c @@ -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; -- 2.30.2