fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed voodoo initialization

Browse source
This commit is contained in:
Keith Whitwell 1999-10-08 11:07:54 +00:00
parent 485f040741
commit f8b3fc5454
3 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mesa/drivers/glide/fxapi.c
View file

@ -926,9 +926,25 @@ fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,GrScreenResolution_t res
fxMesa->haveGlobalPaletteTexture=GL_FALSE; fxMesa->haveGlobalPaletteTexture=GL_FALSE;
fxMesa->haveZBuffer=depthSize ? 1 : 0; fxMesa->haveZBuffer=depthSize ? 1 : 0;
fxMesa->verbose=verbose; 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->width=FX_grSstScreenWidth();
fxMesa->height=FX_grSstScreenHeight(); fxMesa->height=FX_grSstScreenHeight();
fxMesa->board=glbCurrentBoard;
if(verbose) if(verbose)
fprintf(stderr,"Glide screen size: %dx%d\n", 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"; errorstr = "fxDDInitFxMesaContext failed";
goto errorhandler; goto errorhandler;
} }

19
src/mesa/drivers/glide/fxdd.c
View file

@ -368,28 +368,11 @@ static const GLubyte *fxDDGetString(GLcontext *ctx, GLenum name)
} }
int fxDDInitFxMesaContext( fxMesaContext fxMesa, int fxDDInitFxMesaContext( fxMesaContext fxMesa )
int win,
int res,
int ref,
int aux )
{ {
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(); FX_setupGrVertexLayout();
fxMesa->glideContext = glideContext;
if (getenv("FX_EMULATE_SINGLE_TMU")) if (getenv("FX_EMULATE_SINGLE_TMU"))
fxMesa->haveTwoTMUs = GL_FALSE; fxMesa->haveTwoTMUs = GL_FALSE;

3
src/mesa/drivers/glide/fxdrv.h
View file

@ -618,7 +618,6 @@ extern void fxPrintHintState( const char *msg, GLuint state );
extern void fxDDDoRenderVB( struct vertex_buffer *VB ); extern void fxDDDoRenderVB( struct vertex_buffer *VB );
extern int fxDDInitFxMesaContext( fxMesaContext fxMesa, extern int fxDDInitFxMesaContext( fxMesaContext fxMesa );
int win, int res, int ref, int aux );
#endif #endif