fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix some breakage from lifting vbo/tnl code

Browse source
This commit is contained in:
Brian 2007-10-31 12:12:37 -06:00
parent cf3f601682
commit 4990695f1b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mesa/drivers/x11/xm_api.c
View file

@ -1551,6 +1551,9 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
xmesa_init_driver_functions(v, &functions); xmesa_init_driver_functions(v, &functions);
st_init_driver_functions(&functions); st_init_driver_functions(&functions);
/* override st's function */
functions.UpdateState = xmesa_update_state;
/* /*
functions.NewRenderbuffer = xmesa_new_renderbuffer; functions.NewRenderbuffer = xmesa_new_renderbuffer;
*/ */
@ -1594,12 +1597,13 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
/* Initialize the software rasterizer and helper modules. /* Initialize the software rasterizer and helper modules.
*/ */
if (!_swrast_CreateContext( mesaCtx ) || if (!_swrast_CreateContext( mesaCtx )
#if 0 #if 0
!_vbo_CreateContext( mesaCtx ) || || !_vbo_CreateContext( mesaCtx ) ||
!_tnl_CreateContext( mesaCtx ) || !_tnl_CreateContext( mesaCtx ) ||
!_swsetup_CreateContext( mesaCtx )
#endif #endif
!_swsetup_CreateContext( mesaCtx )) { ) {
_mesa_free_context_data(&c->mesa); _mesa_free_context_data(&c->mesa);
_mesa_free(c); _mesa_free(c);
return NULL; return NULL;
@ -1613,12 +1617,14 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
/* swrast setup */ /* swrast setup */
xmesa_register_swrast_functions( mesaCtx ); xmesa_register_swrast_functions( mesaCtx );
_swsetup_Wakeup(mesaCtx);
st_create_context( mesaCtx, st_create_context( mesaCtx,
xmesa_create_softpipe( c ) ); xmesa_create_softpipe( c ) );
_swsetup_CreateContext( mesaCtx );
_swsetup_Wakeup(mesaCtx);
/* override these functions, as if the xlib driver were derived from /* override these functions, as if the xlib driver were derived from
* the softpipe driver. * the softpipe driver.
*/ */