aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/texenvprogram.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-13 22:07:24 +0000
committermarha <marha@users.sourceforge.net>2011-01-13 22:07:24 +0000
commitdc54712d6b67dac7fc745cf3b9019b2c4c81f193 (patch)
tree002b3fd0e0233fe3e6c57d603a8471794f5ba922 /mesalib/src/mesa/main/texenvprogram.c
parentca14143b18b939ee4506936e77478f8c593802b5 (diff)
parenta0a46bd55d7cbbf70757a29c067e21b70ac4e2df (diff)
downloadvcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.gz
vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.bz2
vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texenvprogram.c')
-rw-r--r--mesalib/src/mesa/main/texenvprogram.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/texenvprogram.c b/mesalib/src/mesa/main/texenvprogram.c
index af631af14..c30fe9616 100644
--- a/mesalib/src/mesa/main/texenvprogram.c
+++ b/mesalib/src/mesa/main/texenvprogram.c
@@ -1467,7 +1467,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key,
p.last_tex_stage = 0;
release_temps(ctx, &p);
- if (key->enabled_units) {
+ if (key->enabled_units && key->num_draw_buffers) {
GLboolean needbumpstage = GL_FALSE;
/* Zeroth pass - bump map textures first */
@@ -1560,7 +1560,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key,
_mesa_copy_instructions(p.program->Base.Instructions, instBuffer,
p.program->Base.NumInstructions);
- if (p.program->FogOption) {
+ if (key->num_draw_buffers && p.program->FogOption) {
_mesa_append_fog_code(ctx, p.program);
p.program->FogOption = GL_NONE;
}