diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/attrib.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/points.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/texenv.c | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 6f39cb0610b..52a8ba63363 100644 --- 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 adf71dc58d6..ecdd0184c86 100644 --- 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 7a35953c38a..b86a0eead0f 100644 --- 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 6bb1ce69a9d..2d62e73c126 100644 --- 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 1aa0d6c410a..de49566ec42 100644 --- 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; |