On Sat, Feb 22, 2014 at 11:03 AM, Emil Velikov <emil.l.veli...@gmail.com> wrote:
> Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
> ---
> src/glx/drisw_glx.c | 41 +--------------------------------
> src/glx/drisw_priv.h | 64
> ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 65 insertions(+), 40 deletions(-)
> create mode 100644 src/glx/drisw_priv.h
>
> diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
> index 13a4b96..f2db25d 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 0000000..a1abedf
> --- /dev/null
> +++ b/src/glx/drisw_priv.h
> @@ -0,0 +1,64 @@
> +/* This file was derived from drisw_priv.h which carries the following
This file is drisw_priv.h :-P
> + * 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;
> +};
> --
> 1.9.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
--
o...@lunarg.com
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
