fixed voodoo initialization

diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index 5d0d36ecc3d65000a33938a004c0f303767df26d..baa9f3e15ce65e5627d45b95c0227a8de836aaeb 100644 (file)
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -926,9 +926,25 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,GrScreenResolution_t res
    fxMesa->haveGlobalPaletteTexture=GL_FALSE;
    fxMesa->haveZBuffer=depthSize ? 1 : 0;
    fxMesa->verbose=verbose;
+   fxMesa->board=glbCurrentBoard;
+
+
+   fxMesa->glideContext = FX_grSstWinOpen((FxU32)win,res,ref,
+#if  FXMESA_USE_ARGB
+                                         GR_COLORFORMAT_ARGB,
+#else
+                                         GR_COLORFORMAT_ABGR,
+#endif
+                                         GR_ORIGIN_LOWER_LEFT,
+                                         2,aux);
+   if (!fxMesa->glideContext){
+      errorstr = "grSstWinOpen"; 
+      goto errorhandler;
+   }
+
+
    fxMesa->width=FX_grSstScreenWidth();
    fxMesa->height=FX_grSstScreenHeight();
-   fxMesa->board=glbCurrentBoard;
 
    if(verbose)
       fprintf(stderr,"Glide screen size: %dx%d\n",
@@ -957,7 +973,7 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,GrScreenResolution_t res
    }
 
 
-   if (!fxDDInitFxMesaContext( fxMesa, win, res, ref, aux )) {
+   if (!fxDDInitFxMesaContext( fxMesa )) {
       errorstr = "fxDDInitFxMesaContext failed"; 
       goto errorhandler;
    }

diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index a726b0a44f71cfd60301835cefce61cc9ff212fd..22d24ff2050a17b75eaffc6ce7e3df8072cdf974 100644 (file)
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -368,28 +368,11 @@ static const GLubyte *fxDDGetString(GLcontext *ctx, GLenum name)
 }
 
 
-int fxDDInitFxMesaContext( fxMesaContext fxMesa, 
-                          int win, 
-                          int res,
-                          int ref, 
-                          int aux )
+int fxDDInitFxMesaContext( fxMesaContext fxMesa )
 {
-   FX_GrContext_t glideContext =  FX_grSstWinOpen((FxU32)win,res,ref,
-#if  FXMESA_USE_ARGB
-                                                 GR_COLORFORMAT_ARGB,
-#else
-                                                 GR_COLORFORMAT_ABGR,
-#endif
-                                                 GR_ORIGIN_LOWER_LEFT,
-                                                 2,
-                                                 aux);
-   
-   if (!glideContext) return 0;
   
    FX_setupGrVertexLayout();
    
-   fxMesa->glideContext = glideContext;
-   
    if (getenv("FX_EMULATE_SINGLE_TMU")) 
       fxMesa->haveTwoTMUs = GL_FALSE;
       

diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 3559ad9a0512066e8986090590f8f2ee2a181e2b..f5ef5763383b8fda5ee126bd391b24d576ddbb9b 100644 (file)
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -618,7 +618,6 @@ extern void fxPrintHintState( const char *msg, GLuint state );
 
 extern void fxDDDoRenderVB( struct vertex_buffer *VB );
 
-extern int fxDDInitFxMesaContext( fxMesaContext fxMesa, 
-                                 int win, int res, int ref, int aux );
+extern int fxDDInitFxMesaContext( fxMesaContext fxMesa );
 
 #endif