projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/glsl: set num_textures per stage directly in shader_info
[mesa.git]
/
src
/
mesa
/
main
/
texenv.c
diff --git
a/src/mesa/main/texenv.c
b/src/mesa/main/texenv.c
index 2cf322d1e1a19c194d9427051d9f2e65ce95f9b4..de49566ec42cb66f44b13fda5d0c72c0d3ce3942 100644
(file)
--- a/
src/mesa/main/texenv.c
+++ b/
src/mesa/main/texenv.c
@@
-464,15
+464,13
@@
_mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param )
* but that's what the spec calls for.
*/
if (iparam0 == GL_TRUE) {
* but that's what the spec calls for.
*/
if (iparam0 == GL_TRUE) {
- if (ctx->Point.CoordReplace
Bits
& (1u << ctx->Texture.CurrentUnit))
+ if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
return;
return;
- ctx->Point.CoordReplaceBits |= (1u << ctx->Texture.CurrentUnit);
- ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = GL_TRUE;
+ ctx->Point.CoordReplace |= (1u << ctx->Texture.CurrentUnit);
} else if (iparam0 == GL_FALSE) {
} else if (iparam0 == GL_FALSE) {
- if (~(ctx->Point.CoordReplace
Bits
) & (1u << ctx->Texture.CurrentUnit))
+ if (~(ctx->Point.CoordReplace) & (1u << ctx->Texture.CurrentUnit))
return;
return;
- ctx->Point.CoordReplaceBits &= ~(1u << ctx->Texture.CurrentUnit);
- ctx->Point.CoordReplace[ctx->Texture.CurrentUnit] = GL_FALSE;
+ ctx->Point.CoordReplace &= ~(1u << ctx->Texture.CurrentUnit);
} else {
_mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
return;
} else {
_mesa_error( ctx, GL_INVALID_VALUE, "glTexEnv(param=0x%x)", iparam0);
return;
@@
-679,7
+677,7
@@
_mesa_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params )
return;
}
if (pname == GL_COORD_REPLACE_NV) {
return;
}
if (pname == GL_COORD_REPLACE_NV) {
- if (ctx->Point.CoordReplace
Bits
& (1u << ctx->Texture.CurrentUnit))
+ if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
*params = 1.0f;
else
*params = 0.0f;
*params = 1.0f;
else
*params = 0.0f;
@@
-743,7
+741,7
@@
_mesa_GetTexEnviv( GLenum target, GLenum pname, GLint *params )
return;
}
if (pname == GL_COORD_REPLACE_NV) {
return;
}
if (pname == GL_COORD_REPLACE_NV) {
- if (ctx->Point.CoordReplace
Bits
& (1u << ctx->Texture.CurrentUnit))
+ if (ctx->Point.CoordReplace & (1u << ctx->Texture.CurrentUnit))
*params = GL_TRUE;
else
*params = GL_FALSE;
*params = GL_TRUE;
else
*params = GL_FALSE;