Seems since Mesa 3.4 multitexture was not being properly disabled, removing depreciated extensions was the fixmga-lock-debug-0-2-0-branch

1 files changed, 28 insertions, 25 deletions

diff --git a/xc/lib/GL/mesa/src/drv/mga/mgadd.c b/xc/lib/GL/mesa/src/drv/mga/mgadd.c
index c8f52d286..adb6d8144 100644
--- a/xc/lib/GL/mesa/src/drv/mga/mgadd.c
+++ b/xc/lib/GL/mesa/src/drv/mga/mgadd.c
@@ -26,6 +26,7 @@
 /* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgadd.c,v 1.3 2000/06/22 16:59:24 tsi Exp $ */
 
 
+
 #include "types.h"
 #include "vbrender.h"
 
@@ -34,11 +35,8 @@
 #include <stdlib.h>
 
 #include "mm.h"
-#include "mgalib.h"
-#include "mgaclear.h"
+#include "mgacontext.h"
 #include "mgadd.h"
-#include "mgadepth.h"
-#include "mgalog.h"
 #include "mgastate.h"
 #include "mgaspan.h"
 #include "mgatex.h"
@@ -61,11 +59,11 @@ static const GLubyte *mgaDDGetString( GLcontext *ctx, GLenum name )
    mgaContextPtr mmesa = MGA_CONTEXT( ctx );
    switch (name) {
    case GL_VENDOR:
-      return (GLubyte *)"Precision Insight, Inc.";
+      return (GLubyte *) "Precision Insight, Inc.";
    case GL_RENDERER:
-      if (MGA_IS_G200(mmesa)) return (GLubyte *)"Mesa DRI G200 20000510";
-      if (MGA_IS_G400(mmesa)) return (GLubyte *)"Mesa DRI G400 20000510";
-      return (GLubyte *)"Mesa DRI MGA 20000510";
+      if (MGA_IS_G200(mmesa)) return (GLubyte *) "Mesa DRI G200 20000510";
+      if (MGA_IS_G400(mmesa)) return (GLubyte *) "Mesa DRI G400 20000510";
+      return (GLubyte *) "Mesa DRI MGA 20000510";
    default:
       return 0;
    }
@@ -74,24 +72,28 @@ static const GLubyte *mgaDDGetString( GLcontext *ctx, GLenum name )
 
 static GLint mgaGetParameteri(const GLcontext *ctx, GLint param)
 {
-  switch (param) {
-  case DD_HAVE_HARDWARE_FOG:  
-    return 1; 
-  default:
-    mgaError("mgaGetParameteri(): unknown parameter!\n");
-    return 0;
-  }
+   switch (param) {
+   case DD_HAVE_HARDWARE_FOG:  
+      return 1; 
+   default:
+      fprintf(stderr, "mgaGetParameteri(): unknown parameter!\n");
+      return 0;
+   }
 }
 
 
 static void mgaBufferSize(GLcontext *ctx, GLuint *width, GLuint *height)
 {
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);  
-   
-/*     LOCK_HARDWARE( mmesa ); */
+
+   /* Need to lock to make sure the driDrawable is uptodate.  This
+    * information is used to resize Mesa's software buffers, so it has
+    * to be correct.
+    */
+   LOCK_HARDWARE( mmesa ); 
    *width = mmesa->driDrawable->w;
    *height = mmesa->driDrawable->h;
-/*     UNLOCK_HARDWARE( mmesa ); */
+   UNLOCK_HARDWARE( mmesa ); 
 }
 
 void mgaDDExtensionsInit( GLcontext *ctx )
@@ -102,10 +104,8 @@ void mgaDDExtensionsInit( GLcontext *ctx )
 
    /* Support multitexture only on the g400.
     */
-   if (1 /*!MGA_IS_G400(MGA_CONTEXT(ctx))*/) 
+   if (1 || !MGA_IS_G400(MGA_CONTEXT(ctx))) 
    {
-      gl_extensions_disable( ctx, "GL_EXT_multitexture" );
-      gl_extensions_disable( ctx, "GL_SGIS_multitexture" );
       gl_extensions_disable( ctx, "GL_ARB_multitexture" );
    }
 
@@ -130,11 +130,14 @@ void mgaDDExtensionsInit( GLcontext *ctx )
    gl_extensions_disable( ctx, "GL_INGR_blend_func_separate" );   
    gl_extensions_disable( ctx, "GL_EXT_texture_lod_bias" );   
    gl_extensions_disable( ctx, "GL_MESA_resize_buffers" );   
-}
-
-
-
 
+   gl_extensions_disable( ctx, "GL_SGI_color_matrix" );   
+   gl_extensions_disable( ctx, "GL_SGI_color_table" );   
+   gl_extensions_disable( ctx, "GL_SGIX_pixel_texture" );   
+   gl_extensions_disable( ctx, "GL_ARB_texture_cube_map" );   
+   gl_extensions_disable( ctx, "GL_ARB_texture_compression" );   
+   gl_extensions_disable( ctx, "GL_EXT_convolution" );   
+}