diff options
| author | Brian <brian@yutani.localnet.net> | 2006-12-16 11:07:00 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2006-12-16 11:07:00 -0700 |
| commit | 6d982e53ee079dc6a9a20bd5d80b7f856e943e5d (patch) | |
| tree | 4a9e7fddcb82afeeabc0ce15102661493077fa68 /src/mesa/swrast/s_context.c | |
| parent | 24a495fd77f98b666c1f17e88a8134301cb8dee7 (diff) | |
don't allow fog when using a fragment shader (bug 9346)
Diffstat (limited to 'src/mesa/swrast/s_context.c')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 52d560ffdb..d4b8080ddc 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 6.5.3 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -201,7 +201,10 @@ _swrast_update_fog_state( GLcontext *ctx ) /* determine if fog is needed, and if so, which fog mode */ swrast->_FogEnabled = GL_FALSE; - if (ctx->FragmentProgram._Enabled) { + if (ctx->ShaderObjects._FragmentShaderPresent) { + swrast->_FogEnabled = GL_FALSE; + } + else if (ctx->FragmentProgram._Enabled) { if (ctx->FragmentProgram._Current->Base.Target==GL_FRAGMENT_PROGRAM_ARB) { const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; |