From 6f676f4871b1701ec56298f9d22460677ed0e982 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 2 Nov 2006 18:35:19 +0000 Subject: always load frag prog state params for now (see comments) --- src/mesa/swrast/s_context.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/mesa/swrast/s_context.c') diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 62cf6f2f5a..52d560ffdb 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -227,7 +227,12 @@ _swrast_update_fragment_program(GLcontext *ctx, GLbitfield newState) { if (ctx->FragmentProgram._Enabled) { const struct gl_fragment_program *fp = ctx->FragmentProgram._Current; +#if 0 + /* XXX Need a way to trigger the initial loading of parameters + * even when there's no recent state changes. + */ if (fp->Base.Parameters->StateFlags & newState) +#endif _mesa_load_state_parameters(ctx, fp->Base.Parameters); } } -- cgit v1.2.3 From 6d982e53ee079dc6a9a20bd5d80b7f856e943e5d Mon Sep 17 00:00:00 2001 From: Brian Date: Sat, 16 Dec 2006 11:07:00 -0700 Subject: don't allow fog when using a fragment shader (bug 9346) --- src/mesa/swrast/s_context.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mesa/swrast/s_context.c') 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; -- cgit v1.2.3