← Back to branch summary

~ubuntu-branches/ubuntu/raring/mesa/raring-proposed

« back to all changes in this revision

Viewing changes to src/mesa/swrast/s_context.c

  • Committer: Bazaar Package Importer
  • Author(s): Cyril Brulebois
  • Date: 2011-06-19 21:26:00 UTC
  • mfrom: (1.6.1 upstream) (3.3.18 sid)
  • mto: (3.3.20 sid)
  • mto: This revision was merged to the branch mainline in revision 145.
  • Revision ID: james.westby@ubuntu.com-20110619212600-rleaapdmnbtstekb
Tags: 7.11~0-2
Thank you sbuild for giving a green light when that's not actually the
case. Fix missing Pre-Depends for the libegl1-mesa-drivers package
(multiarch-support).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/swrast/s_context.c
248
248
   SWcontext *swrast = SWRAST_CONTEXT(ctx);
249
249
   const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
250
250
 
 
251
   assert((fp == NULL) || (fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB));
 
252
 
251
253
   /* determine if fog is needed, and if so, which fog mode */
252
 
   swrast->_FogEnabled = GL_FALSE;
253
 
   if (fp && fp->Base.Target == GL_FRAGMENT_PROGRAM_ARB) {
254
 
      if (fp->FogOption != GL_NONE) {
255
 
         swrast->_FogEnabled = GL_TRUE;
256
 
         swrast->_FogMode = fp->FogOption;
257
 
      }
258
 
   }
259
 
   else if (ctx->Fog.Enabled) {
260
 
      swrast->_FogEnabled = GL_TRUE;
261
 
      swrast->_FogMode = ctx->Fog.Mode;
262
 
   }
 
254
   swrast->_FogEnabled = (fp == NULL && ctx->Fog.Enabled);
263
255
}
264
256
 
265
257