i915/i915tex: minor cleanup (remove unneeded function call
authorRoland Scheidegger <sroland@tungstengraphics.com>
Tue, 22 May 2007 00:50:08 +0000 (02:50 +0200)
committerRoland Scheidegger <sroland@tungstengraphics.com>
Tue, 22 May 2007 01:32:25 +0000 (03:32 +0200)
src/mesa/drivers/dri/i915/i915_fragprog.c
src/mesa/drivers/dri/i915tex/i915_fragprog.c

index a28c8bb6fc229f6a5a61ade89abf7a6e625ff461..702b878828243297170a84a800cca271dd4010cc 100644 (file)
@@ -857,11 +857,6 @@ static void i915BindProgram( GLcontext *ctx,
       assert(p->on_hardware == 0);
       assert(p->params_uptodate == 0);
 
-      /* Hack: make sure fog is correctly enabled according to this
-       * fragment program's fog options.
-       */
-      ctx->Driver.Enable( ctx, GL_FRAGMENT_PROGRAM_ARB, 
-                         ctx->FragmentProgram.Enabled );
    }
 }
 
@@ -935,9 +930,6 @@ static void i915ProgramStringNotify( GLcontext *ctx,
       /* Hack: make sure fog is correctly enabled according to this
        * fragment program's fog options.
        */
-      ctx->Driver.Enable( ctx, GL_FRAGMENT_PROGRAM_ARB, 
-                         ctx->FragmentProgram.Enabled );
-
       if (p->FragProg.FogOption) {
          /* add extra instructions to do fog, then turn off FogOption field */
          _mesa_append_fog_code(ctx, &p->FragProg);
index cbea6092a8146996c80f9c851ff49d703e86877e..a4b22a0c32cf0d323d459f2c2514f01f5f16eb39 100644 (file)
@@ -849,11 +849,6 @@ i915BindProgram(GLcontext * ctx, GLenum target, struct gl_program *prog)
       assert(p->on_hardware == 0);
       assert(p->params_uptodate == 0);
 
-      /* Hack: make sure fog is correctly enabled according to this
-       * fragment program's fog options.
-       */
-      ctx->Driver.Enable(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                         ctx->FragmentProgram.Enabled);
    }
 }
 
@@ -926,9 +921,6 @@ i915ProgramStringNotify(GLcontext * ctx,
       /* Hack: make sure fog is correctly enabled according to this
        * fragment program's fog options.
        */
-      ctx->Driver.Enable(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                         ctx->FragmentProgram.Enabled);
-
       if (p->FragProg.FogOption) {
          /* add extra instructions to do fog, then turn off FogOption field */
          _mesa_append_fog_code(ctx, &p->FragProg);