fixed voodoo initialization
This commit is contained in:
parent
485f040741
commit
f8b3fc5454
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue