diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 16:58:33 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 16:58:33 +0100 |
| commit | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (patch) | |
| tree | b18cd9881bc5a6d317edca6c38fa912bade00802 /mesalib/src/mesa/swrast/s_context.c | |
| parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
| download | vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.tar.gz vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.tar.bz2 vcxsrv-a8e5f06fe01732fbd643bc435dd3b8eaa602defe.zip | |
libX11 mesa pixman git update 9 nov 2011
Diffstat (limited to 'mesalib/src/mesa/swrast/s_context.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_context.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c index 9112cf30d..98702f068 100644 --- a/mesalib/src/mesa/swrast/s_context.c +++ b/mesalib/src/mesa/swrast/s_context.c @@ -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); |