[Mesa-dev] [PATCH] st/wgl: Remove wgl*Gallium*MESA().

[Brian Paul]

Reviewed-by: Brian Paul <brianp at vmware.com>


On 03/27/2014 08:58 AM, jfonseca at vmware.com wrote:
> From: José Fonseca <jfonseca at vmware.com>
>
> These were only used by the Python state tracker, which was removed, hence
> they have no practical use.
> ---
>   src/gallium/state_trackers/wgl/Makefile.sources    |  1 -
>   src/gallium/state_trackers/wgl/stw_ext_gallium.c   | 50 ----------------------
>   src/gallium/state_trackers/wgl/stw_ext_gallium.h   | 47 --------------------
>   .../state_trackers/wgl/stw_getprocaddress.c        |  5 ---
>   4 files changed, 103 deletions(-)
>   delete mode 100644 src/gallium/state_trackers/wgl/stw_ext_gallium.c
>   delete mode 100644 src/gallium/state_trackers/wgl/stw_ext_gallium.h
>
> diff --git a/src/gallium/state_trackers/wgl/Makefile.sources b/src/gallium/state_trackers/wgl/Makefile.sources
> index e93342a..d204efd 100644
> --- a/src/gallium/state_trackers/wgl/Makefile.sources
> +++ b/src/gallium/state_trackers/wgl/Makefile.sources
> @@ -3,7 +3,6 @@ C_SOURCES := \
>   	stw_device.c \
>   	stw_ext_context.c \
>   	stw_ext_extensionsstring.c \
> -	stw_ext_gallium.c \
>   	stw_ext_pbuffer.c \
>   	stw_ext_pixelformat.c \
>   	stw_ext_swapinterval.c \
> diff --git a/src/gallium/state_trackers/wgl/stw_ext_gallium.c b/src/gallium/state_trackers/wgl/stw_ext_gallium.c
> deleted file mode 100644
> index 13aa960..0000000
> --- a/src/gallium/state_trackers/wgl/stw_ext_gallium.c
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -/**************************************************************************
> - *
> - * Copyright 2008 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 VMWARE 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 "pipe/p_screen.h"
> -#include "stw_device.h"
> -#include "stw_winsys.h"
> -#include "stw_ext_gallium.h"
> -
> -
> -struct pipe_screen * APIENTRY
> -wglGetGalliumScreenMESA(void)
> -{
> -   return stw_dev ? stw_dev->screen : NULL;
> -}
> -
> -
> -/* XXX: Unify with stw_create_layer_context */
> -struct pipe_context * APIENTRY
> -wglCreateGalliumContextMESA(void)
> -{
> -   if(!stw_dev)
> -      return NULL;
> -
> -   return stw_dev->screen->context_create( stw_dev->screen, NULL );
> -}
> diff --git a/src/gallium/state_trackers/wgl/stw_ext_gallium.h b/src/gallium/state_trackers/wgl/stw_ext_gallium.h
> deleted file mode 100644
> index cc35f2b..0000000
> --- a/src/gallium/state_trackers/wgl/stw_ext_gallium.h
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -/**************************************************************************
> - *
> - * 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 VMWARE 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.
> - *
> - **************************************************************************/
> -
> -#ifndef STW_EXTGALLIUM_H_
> -#define STW_EXTGALLIUM_H_
> -
> -
> -#include <windows.h>
> -
> -
> -struct pipe_screen;
> -struct pipe_context;
> -
> -
> -struct pipe_screen * APIENTRY
> -wglGetGalliumScreenMESA(void);
> -
> -
> -struct pipe_context * APIENTRY
> -wglCreateGalliumContextMESA(void);
> -
> -
> -#endif /* STW_EXTGALLIUM_H_ */
> diff --git a/src/gallium/state_trackers/wgl/stw_getprocaddress.c b/src/gallium/state_trackers/wgl/stw_getprocaddress.c
> index e908316..2ffeec1 100644
> --- a/src/gallium/state_trackers/wgl/stw_getprocaddress.c
> +++ b/src/gallium/state_trackers/wgl/stw_getprocaddress.c
> @@ -33,7 +33,6 @@
>   #include <GL/wglext.h>
>
>   #include "glapi/glapi.h"
> -#include "stw_ext_gallium.h"
>   #include "stw_device.h"
>   #include "stw_icd.h"
>
> @@ -69,10 +68,6 @@ static const struct stw_extension_entry stw_extension_entries[] = {
>      STW_EXTENSION_ENTRY( wglGetSwapIntervalEXT ),
>      STW_EXTENSION_ENTRY( wglSwapIntervalEXT ),
>
> -   /* WGL_EXT_gallium ? */
> -   STW_EXTENSION_ENTRY( wglGetGalliumScreenMESA ),
> -   STW_EXTENSION_ENTRY( wglCreateGalliumContextMESA ),
> -
>      /* WGL_ARB_create_context */
>      STW_EXTENSION_ENTRY( wglCreateContextAttribsARB ),
>
>