diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-13 22:01:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-13 22:01:27 +0000 |
| commit | a0a46bd55d7cbbf70757a29c067e21b70ac4e2df (patch) | |
| tree | 95803181a66e63d191b3fe06a031f9ed8ae701b8 /mesalib/src/mesa/main/texenvprogram.c | |
| parent | 2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85 (diff) | |
| download | vcxsrv-a0a46bd55d7cbbf70757a29c067e21b70ac4e2df.tar.gz vcxsrv-a0a46bd55d7cbbf70757a29c067e21b70ac4e2df.tar.bz2 vcxsrv-a0a46bd55d7cbbf70757a29c067e21b70ac4e2df.zip | |
mesalib pixman xkbcomp git update 13 jan 2011
Diffstat (limited to 'mesalib/src/mesa/main/texenvprogram.c')
| -rw-r--r-- | mesalib/src/mesa/main/texenvprogram.c | 4 |
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;
}
|