summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2006-01-24 20:24:06 +0000
committerAapo Tahkola <aet@rasterburn.org>2006-01-24 20:24:06 +0000
commit4dd8a8907e40126e42131a400b59e7d5da5e302a (patch)
treed25ba62a672a5e1ccaea0ede29ce2196a740b9d0 /src
parent65573edd1bcd734e3b0d7f717149e023e66192e5 (diff)
fix broken get_half & get_zero
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/texenvprogram.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 04738b019b..9153ab60f4 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -593,14 +593,14 @@ static struct ureg get_one( struct texenv_fragment_program *p )
static struct ureg get_half( struct texenv_fragment_program *p )
{
if (is_undef(p->half))
- p->one = register_scalar_const(p, 0.5);
+ p->half = register_scalar_const(p, 0.5);
return p->half;
}
static struct ureg get_zero( struct texenv_fragment_program *p )
{
if (is_undef(p->zero))
- p->one = register_scalar_const(p, 0.0);
+ p->zero = register_scalar_const(p, 0.0);
return p->zero;
}
@@ -937,7 +937,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
GLuint src, GLuint unit )
{
switch (src) {
- case SRC_TEXTURE:
+ case SRC_TEXTURE:
load_texture(p, unit);
break;
@@ -949,7 +949,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
case SRC_TEXTURE5:
case SRC_TEXTURE6:
case SRC_TEXTURE7:
- if (!p->state->unit[src - SRC_TEXTURE0].enabled)
+ if (!p->state->unit[src - SRC_TEXTURE0].enabled)
return GL_FALSE;
load_texture(p, src - SRC_TEXTURE0);
break;