diff options
| author | Alan Hourihane <alanh@vmware.com> | 2009-02-19 18:33:15 +0000 | 
|---|---|---|
| committer | Alan Hourihane <alanh@vmware.com> | 2009-02-23 20:28:55 +0000 | 
| commit | 6b722272709abed5468428da5d2c8951c84867d2 (patch) | |
| tree | d825e69a0c9ce2ab16f7f102ccdaba5ba4343879 /src | |
| parent | 65562453fba69e862d5e3b381d18db9c40d9353c (diff) | |
gallium: add winsys interface for viewport changes to support DRI2
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/include/pipe/internal/p_winsys_screen.h | 5 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_viewport.c | 51 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_viewport.h | 29 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 1 | 
5 files changed, 87 insertions, 0 deletions
| diff --git a/src/gallium/include/pipe/internal/p_winsys_screen.h b/src/gallium/include/pipe/internal/p_winsys_screen.h index ee835578b2..8d3bab0caa 100644 --- a/src/gallium/include/pipe/internal/p_winsys_screen.h +++ b/src/gallium/include/pipe/internal/p_winsys_screen.h @@ -68,6 +68,11 @@ struct pipe_winsys     const char *(*get_name)( struct pipe_winsys *ws );     /** +    * Do any special operations to ensure buffer size is correct +    */ +   void (*update_buffer)( struct pipe_winsys *ws, +                          void *context_private ); +   /**      * Do any special operations to ensure frontbuffer contents are      * displayed, eg copy fake frontbuffer.      */ diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index 1bd81506e0..a76c7b7441 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -201,6 +201,7 @@ STATETRACKER_SOURCES = \  	state_tracker/st_cb_readpixels.c \  	state_tracker/st_cb_strings.c \  	state_tracker/st_cb_texture.c \ +	state_tracker/st_cb_viewport.c \  	state_tracker/st_api.c \  	state_tracker/st_context.c \  	state_tracker/st_debug.c \ diff --git a/src/mesa/state_tracker/st_cb_viewport.c b/src/mesa/state_tracker/st_cb_viewport.c new file mode 100644 index 0000000000..6adf3162c1 --- /dev/null +++ b/src/mesa/state_tracker/st_cb_viewport.c @@ -0,0 +1,51 @@ +/************************************************************************** + *  + * Copyright 2009 VMware, Inc. + * All Rights Reserved. + *  + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + *  + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + *  + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + *  + **************************************************************************/ + +#include "main/glheader.h" +#include "st_context.h" +#include "st_public.h" +#include "st_cb_viewport.h" + +#include "pipe/p_context.h" +#include "pipe/p_inlines.h" +#include "pipe/p_state.h" +#include "pipe/p_defines.h" + +static void st_viewport(GLcontext * ctx, GLint x, GLint y, +                        GLsizei width, GLsizei height) +{ +   struct st_context *st = ctx->st; + +   if (st->pipe->winsys) +      st->pipe->winsys->update_buffer( st->pipe->winsys, +                                       st->pipe->priv ); +} + +void st_init_viewport_functions(struct dd_function_table *functions) +{ +   functions->Viewport = st_viewport; +} diff --git a/src/mesa/state_tracker/st_cb_viewport.h b/src/mesa/state_tracker/st_cb_viewport.h new file mode 100644 index 0000000000..44948e5316 --- /dev/null +++ b/src/mesa/state_tracker/st_cb_viewport.h @@ -0,0 +1,29 @@ +/************************************************************************** + *  + * Copyright 2009 VMware, Inc. + * All Rights Reserved. + *  + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + *  + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + *  + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + *  + **************************************************************************/ + +extern void +st_init_viewport_functions(struct dd_function_table *functions); diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 6d6c9f4332..916cf2f64c 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -320,6 +320,7 @@ void st_init_driver_functions(struct dd_function_table *functions)     st_init_texture_functions(functions);     st_init_flush_functions(functions);     st_init_string_functions(functions); +   st_init_viewport_functions(functions);     functions->UpdateState = st_invalidate_state;  } | 
