diff options
author | Emil Velikov <[email protected]> | 2014-02-21 23:09:16 +0000 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-08-15 17:35:36 +0100 |
commit | d10ba8b7c04b6f0f7f8e62715b7006494fb3915f (patch) | |
tree | de3101f870d1f3543696fbd9368a523cded44023 /src | |
parent | ffb8e884f7c466c36cf64bf56ff63c52a833fa66 (diff) |
glx/drisw: Move private structure declarations to a header file
v2: Reff the correct file wrt copyright, spotted by Chia-I
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/glx/drisw_glx.c | 41 | ||||
-rw-r--r-- | src/glx/drisw_priv.h | 64 |
2 files changed, 65 insertions, 40 deletions
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index fcb5d8f5789..fab9e70d63a 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -27,46 +27,7 @@ #include "glxclient.h" #include <dlfcn.h> #include "dri_common.h" - -struct drisw_display -{ - __GLXDRIdisplay base; -}; - -struct drisw_context -{ - struct glx_context base; - __DRIcontext *driContext; - -}; - -struct drisw_screen -{ - struct glx_screen base; - - __DRIscreen *driScreen; - __GLXDRIscreen vtable; - const __DRIcoreExtension *core; - const __DRIswrastExtension *swrast; - const __DRItexBufferExtension *texBuffer; - const __DRIcopySubBufferExtension *copySubBuffer; - - const __DRIconfig **driver_configs; - - void *driver; -}; - -struct drisw_drawable -{ - __GLXDRIdrawable base; - - GC gc; - GC swapgc; - - __DRIdrawable *driDrawable; - XVisualInfo *visinfo; - XImage *ximage; -}; +#include "drisw_priv.h" static Bool XCreateDrawable(struct drisw_drawable * pdp, diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h new file mode 100644 index 00000000000..a8de2a7b60d --- /dev/null +++ b/src/glx/drisw_priv.h @@ -0,0 +1,64 @@ +/* This file was derived from drisw_glx.c which carries the following + * copyright: + * + * Copyright 2008 George Sapountzis + * + * 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, sublicense, + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + */ + +struct drisw_display +{ + __GLXDRIdisplay base; +}; + +struct drisw_context +{ + struct glx_context base; + __DRIcontext *driContext; + +}; + +struct drisw_screen +{ + struct glx_screen base; + + __DRIscreen *driScreen; + __GLXDRIscreen vtable; + const __DRIcoreExtension *core; + const __DRIswrastExtension *swrast; + const __DRItexBufferExtension *texBuffer; + const __DRIcopySubBufferExtension *copySubBuffer; + + const __DRIconfig **driver_configs; + + void *driver; +}; + +struct drisw_drawable +{ + __GLXDRIdrawable base; + + GC gc; + GC swapgc; + + __DRIdrawable *driDrawable; + XVisualInfo *visinfo; + XImage *ximage; +}; |