fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swrast: update program type assertion

Browse source 
Fixes bogus failed assertion when using NV_fragment_program, such
as with demos/fplight.c

Note: This is a candidate for the 7.11 branch.
This commit is contained in:
Brian Paul 2011-11-03 19:56:51 -06:00
parent af734468fe
commit b64dc2a275
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/swrast/s_context.c
View file

@ -249,7 +249,9 @@ _swrast_update_fog_state( struct gl_context *ctx )
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
assert((fp == NULL) || (fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB));
assert((fp == NULL) ||
(fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) ||
(fp->Base.Target == GL_FRAGMENT_PROGRAM_NV));
/* determine if fog is needed, and if so, which fog mode */
swrast->_FogEnabled = (fp == NULL && ctx->Fog.Enabled);