diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 1999-10-08 11:07:54 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 1999-10-08 11:07:54 +0000 |
| commit | f8b3fc54540b76c491cee6624c48ca935b07c4b0 (patch) | |
| tree | 5a533af34d2ab893ac6132b159e0f1bea963d563 /src/mesa/drivers/glide | |
| parent | 485f04074151686fa24d40e3eeb83029d3d8c425 (diff) | |
fixed voodoo initialization
Diffstat (limited to 'src/mesa/drivers/glide')
| -rw-r--r-- | src/mesa/drivers/glide/fxapi.c | 20 | ||||
| -rw-r--r-- | src/mesa/drivers/glide/fxdd.c | 19 | ||||
| -rw-r--r-- | src/mesa/drivers/glide/fxdrv.h | 3 |
3 files changed, 20 insertions, 22 deletions
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c index 5d0d36ecc3..baa9f3e15c 100644 --- 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 a726b0a44f..22d24ff205 100644 --- 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 3559ad9a05..f5ef576338 100644 --- 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 |