xlib: don't explicitly create the pipe_winsys struct

This commit is contained in:
Keith Whitwell 2009-01-17 17:06:14 +00:00
parent 2d155f91d2
commit 4f134f91a4
2 changed files with 2 additions and 16 deletions

View file

@ -65,7 +65,6 @@
#include "state_tracker/st_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
#include "pipe/p_winsys.h"
#include "pipe/p_context.h"
#include "xm_winsys.h"
@ -743,7 +742,6 @@ PUBLIC
XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
{
static GLboolean firstTime = GL_TRUE;
struct pipe_winsys *winsys;
struct pipe_screen *screen;
struct pipe_context *pipe;
XMesaContext c;
@ -768,13 +766,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
/* XXX: create once per Xlib Display.
*/
winsys = driver.create_pipe_winsys();
if (winsys == NULL)
goto fail;
/* XXX: create once per Xlib Display.
*/
screen = driver.create_pipe_screen( winsys );
screen = driver.create_pipe_screen();
if (screen == NULL)
goto fail;
@ -811,9 +803,6 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
if (screen)
screen->destroy( screen );
if (winsys)
winsys->destroy( winsys );
FREE(c);
return NULL;
}

View file

@ -31,16 +31,13 @@
struct pipe_context;
struct pipe_screen;
struct pipe_winsys;
struct pipe_surface;
struct xmesa_buffer;
struct xm_driver {
struct pipe_winsys *(*create_pipe_winsys)( void );
struct pipe_screen *(*create_pipe_screen)( struct pipe_winsys * );
struct pipe_screen *(*create_pipe_screen)( void );
/* The context_private argument needs to go away. Is currently used
* in a round-about way to associate a display-target surface with its