summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorAapo Tahkola <[email protected]>2005-04-25 09:50:45 +0000
committerAapo Tahkola <[email protected]>2005-04-25 09:50:45 +0000
commitc3259fa436cb512bd3c3a446252c8e11a3aec432 (patch)
tree293822d648bf6c92f1e059cf984b29eb35979356 /src/mesa/drivers
parentb83aadb0e4cc61638ead165af25b954e5e070d07 (diff)
Fix as suggested by Ben Skeggs.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/r300/r300_texprog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texprog.c b/src/mesa/drivers/dri/r300/r300_texprog.c
index bcc101e8377..d38acd840da 100644
--- a/src/mesa/drivers/dri/r300/r300_texprog.c
+++ b/src/mesa/drivers/dri/r300/r300_texprog.c
@@ -206,12 +206,12 @@ GLuint emit_texenv(r300ContextPtr r300, GLuint tc_reg, GLuint unit)
break;
case GL_COMBINE:
WARN_ONCE("EnvMode == GL_COMBINE unsupported! Help Me!!\n");
- return Cf;
+ return get_source(ps, GL_TEXTURE, unit, tc_reg);
break;
default:
WARN_ONCE("Unknown EnvMode == %d, name=%d\n", envmode,
_mesa_lookup_enum_by_nr(envmode));
- return Cf;
+ return get_source(ps, GL_TEXTURE, unit, tc_reg);
break;
}