[Xorg-commit] xc/lib/GL/mesa/src/drv/gamma gamma_state.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/GL/mesa/src/drv/gamma
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/GL/mesa/src/drv/gamma

Modified Files:
      Tag: XORG-CURRENT
	gamma_state.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: gamma_state.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/gamma/gamma_state.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/gamma_state.c	26 Nov 2003 22:48:31 -0000	1.1.4.1
+++ b/gamma_state.c	23 Feb 2004 21:34:02 -0000	1.1.4.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_state.c,v 1.6 2003/09/28 20:15:10 alanh Exp $ */
+/* $XFree86: xc/lib/GL/mesa/src/drv/gamma/gamma_state.c,v 1.7 2003/12/22 17:48:03 tsi Exp $ */
 /*
  * Copyright 2001 by Alan Hourihane.
  *
@@ -589,6 +589,7 @@
    }
 }
 
+#if 0
 static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
@@ -596,6 +597,7 @@
    FLUSH_BATCH( gmesa );
    gmesa->new_state |= GAMMA_NEW_FOG;
 }
+#endif
 
 /* =============================================================
  * Lines