Mesa (gallium-drm-driver-descriptor): gallium: Drop sw drm winsys

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Tue Jun 22 18:44:56 PDT 2010


Module: Mesa
Branch: gallium-drm-driver-descriptor
Commit: 23a915e2cfbc95c018946155eb301ffad3a0d550
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=23a915e2cfbc95c018946155eb301ffad3a0d550

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Jun 23 03:31:18 2010 +0200

gallium: Drop sw drm winsys

Last user went away

---

 configure.ac                           |    2 +-
 src/gallium/winsys/sw/drm/Makefile     |   12 ----
 src/gallium/winsys/sw/drm/SConscript   |   21 -------
 src/gallium/winsys/sw/drm/sw_drm_api.c |  103 --------------------------------
 src/gallium/winsys/sw/drm/sw_drm_api.h |   34 -----------
 5 files changed, 1 insertions(+), 171 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6fc0e2a..4a676d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,7 +486,7 @@ xlib)
 dri)
     SRC_DIRS="$SRC_DIRS glx"
     DRIVER_DIRS="dri"
-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri sw/drm"
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
     ;;
 osmesa)
     DRIVER_DIRS="osmesa"
diff --git a/src/gallium/winsys/sw/drm/Makefile b/src/gallium/winsys/sw/drm/Makefile
deleted file mode 100644
index 7966453..0000000
--- a/src/gallium/winsys/sw/drm/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = swdrm
-
-C_SOURCES = sw_drm_api.c
-
-LIBRARY_INCLUDES =
-
-LIBRARY_DEFINES =
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/sw/drm/SConscript b/src/gallium/winsys/sw/drm/SConscript
deleted file mode 100644
index 15a2e05..0000000
--- a/src/gallium/winsys/sw/drm/SConscript
+++ /dev/null
@@ -1,21 +0,0 @@
-#######################################################################
-# SConscript for xlib winsys
-
-
-Import('*')
-
-env = env.Clone()
-
-env.Append(CPPPATH = [
-    '#/src/gallium/include',
-    '#/src/gallium/auxiliary',
-    '#/src/gallium/drivers',
-])
-
-ws_drm = env.ConvenienceLibrary(
-    target = 'ws_drm',
-    source = [
-       'sw_drm_api.c',
-    ]
-)
-Export('ws_drm')
diff --git a/src/gallium/winsys/sw/drm/sw_drm_api.c b/src/gallium/winsys/sw/drm/sw_drm_api.c
deleted file mode 100644
index 7b86382..0000000
--- a/src/gallium/winsys/sw/drm/sw_drm_api.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/**********************************************************
- * Copyright 2010 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, 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 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.
- *
- **********************************************************/
-
-
-#include "util/u_memory.h"
-#include "softpipe/sp_public.h"
-#include "state_tracker/drm_api.h"
-#include "../../sw/wrapper/wrapper_sw_winsys.h"
-#include "sw_drm_api.h"
-
-
-/*
- * Defines
- */
-
-
-struct sw_drm_api
-{
-   struct drm_api base;
-   struct drm_api *api;
-   struct sw_winsys *sw;
-};
-
-static INLINE struct sw_drm_api *
-sw_drm_api(struct drm_api *api)
-{
-   return (struct sw_drm_api *)api;
-}
-
-
-/*
- * Exported functions
- */
-
-
-static struct pipe_screen *
-sw_drm_create_screen(struct drm_api *_api, int drmFD)
-{
-   struct sw_drm_api *swapi = sw_drm_api(_api);
-   struct drm_api *api = swapi->api;
-   struct sw_winsys *sww;
-   struct pipe_screen *screen;
-
-   screen = api->create_screen(api, drmFD);
-   if (!screen)
-      return NULL;
-
-   sww = wrapper_sw_winsys_warp_pipe_screen(screen);
-   if (!sww)
-      return NULL;
-
-   return softpipe_create_screen(sww);
-}
-
-static void
-sw_drm_destroy(struct drm_api *api)
-{
-   struct sw_drm_api *swapi = sw_drm_api(api);
-   if (swapi->api->destroy)
-      swapi->api->destroy(swapi->api);
-
-   FREE(swapi);
-}
-
-struct drm_api *
-sw_drm_api_create(struct drm_api *api)
-{
-   struct sw_drm_api *swapi = CALLOC_STRUCT(sw_drm_api);
-
-   if (!swapi)
-      return api;
-
-   swapi->base.name = api->name;
-   swapi->base.driver_name = api->driver_name;
-   swapi->base.create_screen = sw_drm_create_screen;
-   swapi->base.destroy = sw_drm_destroy;
-
-   swapi->api = api;
-
-   return &swapi->base;
-}
diff --git a/src/gallium/winsys/sw/drm/sw_drm_api.h b/src/gallium/winsys/sw/drm/sw_drm_api.h
deleted file mode 100644
index ce90a04..0000000
--- a/src/gallium/winsys/sw/drm/sw_drm_api.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**********************************************************
- * Copyright 2010 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, 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 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.
- *
- **********************************************************/
-
-
-#ifndef SW_DRM_API_H
-#define SW_DRM_API_H
-
-struct drm_api;
-
-struct drm_api * sw_drm_api_create(struct drm_api *api);
-
-#endif



More information about the mesa-commit mailing list