diff options
| author | Mathias Fröhlich <mathias.froehlich@web.de> | 2016-05-22 14:10:19 +0200 |
|---|---|---|
| committer | Mathias Fröhlich <mathias.froehlich@web.de> | 2016-06-16 05:50:53 +0200 |
| commit | 6749d77c690d2254b8ed3f16a653c41565ebab49 (patch) | |
| tree | c45d66aecd061b1b2047650a97c86a5b4e7e87f2 /src/mesa/main/texenv.c | |
| parent | 291f00fa12a35ad2bcaa8f81309fa06b9cab6802 (diff) | |
| download | external_mesa3d-6749d77c690d2254b8ed3f16a653c41565ebab49.zip external_mesa3d-6749d77c690d2254b8ed3f16a653c41565ebab49.tar.gz external_mesa3d-6749d77c690d2254b8ed3f16a653c41565ebab49.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/texenv.c')
| -rw-r--r-- | src/mesa/main/texenv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c index 1aa0d6c..de49566 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; |