From: Aapo Tahkola <aet@rasterburn.org>
Date: Mon, 25 Apr 2005 09:50:45 +0000 (+0000)
Subject: Fix as suggested by Ben Skeggs.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c3259fa436cb512bd3c3a446252c8e11a3aec432;p=mesa.git

Fix as suggested by Ben Skeggs.
---

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;
 	}