diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2009-01-17 17:06:14 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2009-01-17 17:06:14 +0000 |
| commit | 4f134f91a427b053d1bc069cb6cac48a0982abc3 (patch) | |
| tree | 7a7c76d2efb352223feea127f3b777b473c4e8fe /src/gallium/state_trackers/glx | |
| parent | 2d155f91d22d67c3aee5a11219a6e1a7c45c2d74 (diff) | |
xlib: don't explicitly create the pipe_winsys struct
Diffstat (limited to 'src/gallium/state_trackers/glx')
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_api.c | 13 | ||||
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/xm_winsys.h | 5 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 4811641559..e0b666ffc8 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -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; } diff --git a/src/gallium/state_trackers/glx/xlib/xm_winsys.h b/src/gallium/state_trackers/glx/xlib/xm_winsys.h index 8b6d1644e8..0e57605c34 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_winsys.h +++ b/src/gallium/state_trackers/glx/xlib/xm_winsys.h @@ -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 |