From 15321a55e541c3209be6636ea467695a0bc6d55d Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Fri, 14 May 2010 12:12:54 +0100 Subject: graw: combine graw_init and graw_create_window functions Different environments seem to want to create these in different orders. Abstract over this by combining the calls. --- src/gallium/include/state_tracker/graw.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/gallium/include/state_tracker') diff --git a/src/gallium/include/state_tracker/graw.h b/src/gallium/include/state_tracker/graw.h index 87e7d97..e5b298e 100644 --- a/src/gallium/include/state_tracker/graw.h +++ b/src/gallium/include/state_tracker/graw.h @@ -19,20 +19,18 @@ struct pipe_screen; struct pipe_context; -PUBLIC struct pipe_screen *graw_init( void ); - /* Returns a handle to be used with flush_frontbuffer()/present(). * * Query format support with screen::is_format_supported and usage * XXX. */ -PUBLIC void *graw_create_window( int x, - int y, - unsigned width, - unsigned height, - enum pipe_format format ); +PUBLIC struct pipe_screen *graw_create_window_and_screen( int x, + int y, + unsigned width, + unsigned height, + enum pipe_format format, + void **handle); -PUBLIC void graw_destroy_window( void *handle ); PUBLIC void graw_set_display_func( void (*func)( void ) ); PUBLIC void graw_main_loop( void ); -- cgit v1.1