Fixed several drivers that incorrectly used 0 for visualRating and

transparentPixel instead of GLX_NONE.  Several _EXT enums were
replaced by the "core" versions.

9 files changed, 39 insertions, 39 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
index 63cedb59f..c42ee232d 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dri.c
@@ -158,9 +158,9 @@ static Bool R128InitVisualConfigs(ScreenPtr pScreen)
 		pConfigs[i].auxBuffers         = 0;
 		pConfigs[i].level              = 0;
 		if (accum || stencil) {
-		   pConfigs[i].visualRating    = GLX_SLOW_VISUAL_EXT;
+		   pConfigs[i].visualRating    = GLX_SLOW_CONFIG;
 		} else {
-		   pConfigs[i].visualRating    = GLX_NONE_EXT;
+		   pConfigs[i].visualRating    = GLX_NONE;
 		}
 		pConfigs[i].transparentPixel   = GLX_NONE;
 		pConfigs[i].transparentRed     = 0;
@@ -243,9 +243,9 @@ static Bool R128InitVisualConfigs(ScreenPtr pScreen)
 		pConfigs[i].auxBuffers         = 0;
 		pConfigs[i].level              = 0;
 		if (accum || stencil) {
-		   pConfigs[i].visualRating    = GLX_SLOW_VISUAL_EXT;
+		   pConfigs[i].visualRating    = GLX_SLOW_CONFIG;
 		} else {
-		   pConfigs[i].visualRating    = GLX_NONE_EXT;
+		   pConfigs[i].visualRating    = GLX_NONE;
 		}
 		pConfigs[i].transparentPixel   = GLX_NONE;
 		pConfigs[i].transparentRed     = 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
index 099641a5e..d6c000fd6 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c
@@ -173,9 +173,9 @@ static Bool RADEONInitVisualConfigs(ScreenPtr pScreen)
 		pConfigs[i].auxBuffers         = 0;
 		pConfigs[i].level              = 0;
 		if (accum) {
-		   pConfigs[i].visualRating    = GLX_SLOW_VISUAL_EXT;
+		   pConfigs[i].visualRating    = GLX_SLOW_CONFIG;
 		} else {
-		   pConfigs[i].visualRating    = GLX_NONE_EXT;
+		   pConfigs[i].visualRating    = GLX_NONE;
 		}
 		pConfigs[i].transparentPixel   = GLX_NONE;
 		pConfigs[i].transparentRed     = 0;
@@ -258,9 +258,9 @@ static Bool RADEONInitVisualConfigs(ScreenPtr pScreen)
 		pConfigs[i].auxBuffers         = 0;
 		pConfigs[i].level              = 0;
 		if (accum) {
-		   pConfigs[i].visualRating    = GLX_SLOW_VISUAL_EXT;
+		   pConfigs[i].visualRating    = GLX_SLOW_CONFIG;
 		} else {
-		   pConfigs[i].visualRating    = GLX_NONE_EXT;
+		   pConfigs[i].visualRating    = GLX_NONE;
 		}
 		pConfigs[i].transparentPixel   = GLX_NONE;
 		pConfigs[i].transparentRed     = 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
index d4f6621b4..c5354f446 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.c
@@ -162,11 +162,11 @@ GLINTInitVisualConfigs(ScreenPtr pScreen)
                pConfigs[i].auxBuffers		= 0;
                pConfigs[i].level		= 0;
                if ( accum || stencil ) {
-                  pConfigs[i].visualRating	= GLX_SLOW_VISUAL_EXT;
+                  pConfigs[i].visualRating	= GLX_SLOW_CONFIG;
                } else {
-                  pConfigs[i].visualRating	= GLX_NONE_EXT;
+                  pConfigs[i].visualRating	= GLX_NONE;
 	       }
-               pConfigs[i].transparentPixel	= 0;
+               pConfigs[i].transparentPixel	= GLX_NONE;
                pConfigs[i].transparentRed	= 0;
                pConfigs[i].transparentGreen	= 0;
                pConfigs[i].transparentBlue	= 0;
@@ -255,11 +255,11 @@ GLINTInitVisualConfigs(ScreenPtr pScreen)
                pConfigs[i].auxBuffers		= 0;
                pConfigs[i].level		= 0;
                if ( accum ) {
-                  pConfigs[i].visualRating	= GLX_SLOW_VISUAL_EXT;
+                  pConfigs[i].visualRating	= GLX_SLOW_CONFIG;
                } else {
-                  pConfigs[i].visualRating	= GLX_NONE_EXT;
+                  pConfigs[i].visualRating	= GLX_NONE;
 	       }
-               pConfigs[i].transparentPixel	= 0;
+               pConfigs[i].transparentPixel	= GLX_NONE;
                pConfigs[i].transparentRed	= 0;
                pConfigs[i].transparentGreen	= 0;
                pConfigs[i].transparentBlue	= 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
index 8daeaeac8..6b763444b 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c
@@ -209,10 +209,10 @@ I810InitVisualConfigs(ScreenPtr pScreen)
 	       pConfigs[i].auxBuffers = 0;
 	       pConfigs[i].level = 0;
 	       if (stencil || accum)
-		  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+		  pConfigs[i].visualRating = GLX_SLOW_CONFIG;
 	       else
-		  pConfigs[i].visualRating = GLX_NONE_EXT;
-	       pConfigs[i].transparentPixel = 0;
+		  pConfigs[i].visualRating = GLX_NONE;
+	       pConfigs[i].transparentPixel = GLX_NONE;
 	       pConfigs[i].transparentRed = 0;
 	       pConfigs[i].transparentGreen = 0;
 	       pConfigs[i].transparentBlue = 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
index b6655c943..1425b20af 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.c
@@ -270,10 +270,10 @@ I830InitVisualConfigs(ScreenPtr pScreen)
 	       pConfigs[i].auxBuffers = 0;
 	       pConfigs[i].level = 0;
 	       if (stencil || accum)
-		  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+		  pConfigs[i].visualRating = GLX_SLOW_CONFIG;
 	       else
-		  pConfigs[i].visualRating = GLX_NONE_EXT;
-	       pConfigs[i].transparentPixel = 0;
+		  pConfigs[i].visualRating = GLX_NONE;
+	       pConfigs[i].transparentPixel = GLX_NONE;
 	       pConfigs[i].transparentRed = 0;
 	       pConfigs[i].transparentGreen = 0;
 	       pConfigs[i].transparentBlue = 0;
@@ -357,11 +357,11 @@ I830InitVisualConfigs(ScreenPtr pScreen)
 	       pConfigs[i].auxBuffers = 0;
 	       pConfigs[i].level = 0;
 	       if (accum) {
-		  pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+		  pConfigs[i].visualRating = GLX_SLOW_CONFIG;
 	       } else {
-		  pConfigs[i].visualRating = GLX_NONE_EXT;
+		  pConfigs[i].visualRating = GLX_NONE;
 	       }
-	       pConfigs[i].transparentPixel = 0;
+	       pConfigs[i].transparentPixel = GLX_NONE;
 	       pConfigs[i].transparentRed = 0;
 	       pConfigs[i].transparentGreen = 0;
 	       pConfigs[i].transparentBlue = 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
index 85a7f8dcb..f267fb056 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c
@@ -192,11 +192,11 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
                pConfigs[i].auxBuffers		= 0;
                pConfigs[i].level		= 0;
                if ( accum || stencil ) {
-                  pConfigs[i].visualRating	= GLX_SLOW_VISUAL_EXT;
+                  pConfigs[i].visualRating	= GLX_SLOW_CONFIG;
                } else {
-                  pConfigs[i].visualRating	= GLX_NONE_EXT;
+                  pConfigs[i].visualRating	= GLX_NONE;
 	       }
-               pConfigs[i].transparentPixel	= 0;
+               pConfigs[i].transparentPixel	= GLX_NONE;
                pConfigs[i].transparentRed	= 0;
                pConfigs[i].transparentGreen	= 0;
                pConfigs[i].transparentBlue	= 0;
@@ -285,11 +285,11 @@ static Bool MGAInitVisualConfigs( ScreenPtr pScreen )
                pConfigs[i].auxBuffers		= 0;
                pConfigs[i].level		= 0;
                if ( accum ) {
-                  pConfigs[i].visualRating	= GLX_SLOW_VISUAL_EXT;
+                  pConfigs[i].visualRating	= GLX_SLOW_CONFIG;
                } else {
-                  pConfigs[i].visualRating	= GLX_NONE_EXT;
+                  pConfigs[i].visualRating	= GLX_NONE;
 	       }
-               pConfigs[i].transparentPixel	= 0;
+               pConfigs[i].transparentPixel	= GLX_NONE;
                pConfigs[i].transparentRed	= 0;
                pConfigs[i].transparentGreen	= 0;
                pConfigs[i].transparentBlue	= 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
index 5eb43f55a..0f4403af7 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c
@@ -169,8 +169,8 @@ SISInitVisualConfigs(ScreenPtr pScreen)
           }
           pConfigs[i].auxBuffers = 0;
           pConfigs[i].level = 0;
-          pConfigs[i].visualRating = GLX_NONE_EXT;
-          pConfigs[i].transparentPixel = 0;
+          pConfigs[i].visualRating = GLX_NONE;
+          pConfigs[i].transparentPixel = GLX_NONE;
           pConfigs[i].transparentRed = 0;
           pConfigs[i].transparentGreen = 0;
           pConfigs[i].transparentBlue = 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
index 334bdfdbe..49dfe2d21 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c
@@ -123,8 +123,8 @@ FFBDRIInitVisualConfigs(ScreenPtr pScreen)
 	pConfigs->stencilSize = 0;
 	pConfigs->auxBuffers = 0;
 	pConfigs->level = 0;
-	pConfigs->visualRating = 0;
-	pConfigs->transparentPixel = 0;
+	pConfigs->visualRating = GLX_NONE;
+	pConfigs->transparentPixel = GLX_NONE;
 	pConfigs->transparentRed = 0;
 	pConfigs->transparentGreen = 0;
 	pConfigs->transparentBlue = 0;
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index 0df0b4396..2fc9d16ae 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -116,10 +116,10 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
 	    pConfigs[i].auxBuffers = 0;
 	    pConfigs[i].level = 0;
 	    if (stencil || accum)
-	      pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+	      pConfigs[i].visualRating = GLX_SLOW_CONFIG;
 	    else
-	      pConfigs[i].visualRating = GLX_NONE_EXT;
-	    pConfigs[i].transparentPixel = 0;
+	      pConfigs[i].visualRating = GLX_NONE;
+	    pConfigs[i].transparentPixel = GLX_NONE;
 	    pConfigs[i].transparentRed = 0;
 	    pConfigs[i].transparentGreen = 0;
 	    pConfigs[i].transparentBlue = 0;
@@ -211,10 +211,10 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
 	    pConfigs[i].auxBuffers = 0;
 	    pConfigs[i].level = 0;
 	    if (accum)
-	      pConfigs[i].visualRating = GLX_SLOW_VISUAL_EXT;
+	      pConfigs[i].visualRating = GLX_SLOW_CONFIG;
 	    else
-	      pConfigs[i].visualRating = GLX_NONE_EXT;
-	    pConfigs[i].transparentPixel = 0;
+	      pConfigs[i].visualRating = GLX_NONE;
+	    pConfigs[i].transparentPixel = GLX_NONE;
 	    pConfigs[i].transparentRed = 0;
 	    pConfigs[i].transparentGreen = 0;
 	    pConfigs[i].transparentBlue = 0;