winsys/sw/fbdev: remove unused software winsys

st/egl was its only user.

Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Matt Turner <[email protected]>

7 files changed, 0 insertions, 344 deletions

diff --git a/configure.ac b/configure.ac
index e0aec6df437..b40ea7ff5a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2418,7 +2418,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/winsys/radeon/drm/Makefile
 		src/gallium/winsys/svga/drm/Makefile
 		src/gallium/winsys/sw/dri/Makefile
-		src/gallium/winsys/sw/fbdev/Makefile
 		src/gallium/winsys/sw/kms-dri/Makefile
 		src/gallium/winsys/sw/null/Makefile
 		src/gallium/winsys/sw/wrapper/Makefile
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 47579ed939f..9285037e17b 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -96,10 +96,6 @@ if HAVE_DRI2
 SUBDIRS += winsys/sw/kms-dri
 endif
 
-if HAVE_EGL_PLATFORM_FBDEV
-SUBDIRS += winsys/sw/fbdev
-endif
-
 SUBDIRS += winsys/sw/wrapper
 
 ##
diff --git a/src/gallium/winsys/sw/fbdev/Makefile.am b/src/gallium/winsys/sw/fbdev/Makefile.am
deleted file mode 100644
index 93c8f88aaff..00000000000
--- a/src/gallium/winsys/sw/fbdev/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# 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.
-
-include Makefile.sources
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_WINSYS_CFLAGS)
-
-noinst_LTLIBRARIES = libfbdev.la
-
-libfbdev_la_SOURCES = $(C_SOURCES)
-
-EXTRA_DIST = SConscript
diff --git a/src/gallium/winsys/sw/fbdev/Makefile.sources b/src/gallium/winsys/sw/fbdev/Makefile.sources
deleted file mode 100644
index dd48051cfd5..00000000000
--- a/src/gallium/winsys/sw/fbdev/Makefile.sources
+++ /dev/null
@@ -1,3 +0,0 @@
-C_SOURCES := \
-	fbdev_sw_winsys.c \
-	fbdev_sw_winsys.h
diff --git a/src/gallium/winsys/sw/fbdev/SConscript b/src/gallium/winsys/sw/fbdev/SConscript
deleted file mode 100644
index bf504ad28d8..00000000000
--- a/src/gallium/winsys/sw/fbdev/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-#######################################################################
-# SConscript for fbdev winsys
-
-
-Import('*')
-
-if env['platform'] == 'linux':
-
-    env = env.Clone()
-
-    env.Append(CPPPATH = [
-        '#/src/gallium/include',
-        '#/src/gallium/auxiliary',
-    ])
-
-    ws_fbdev = env.ConvenienceLibrary(
-        target = 'ws_fbdev',
-        source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
-    )
-    Export('ws_fbdev')
diff --git a/src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.c b/src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.c
deleted file mode 100644
index cc3ce1a78d2..00000000000
--- a/src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2010 LunarG Inc.
- *
- * 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.
- *
- * Authors:
- *    Chia-I Wu <[email protected]>
- */
-
-#include <sys/mman.h>
-#include <sys/ioctl.h>
-#include <linux/fb.h>
-
-#include "pipe/p_compiler.h"
-#include "util/u_format.h"
-#include "util/u_math.h"
-#include "util/u_memory.h"
-#include "state_tracker/sw_winsys.h"
-
-#include "fbdev_sw_winsys.h"
-
-struct fbdev_sw_displaytarget
-{
-   enum pipe_format format;
-   unsigned width;
-   unsigned height;
-   unsigned stride;
-
-   void *data;
-   void *mapped;
-};
-
-struct fbdev_sw_winsys
-{
-   struct sw_winsys base;
-
-   int fd;
-
-   struct fb_fix_screeninfo finfo;
-   unsigned rows;
-   unsigned stride;
-};
-
-static INLINE struct fbdev_sw_displaytarget *
-fbdev_sw_displaytarget(struct sw_displaytarget *dt)
-{
-   return (struct fbdev_sw_displaytarget *) dt;
-}
-
-static INLINE struct fbdev_sw_winsys *
-fbdev_sw_winsys(struct sw_winsys *ws)
-{
-   return (struct fbdev_sw_winsys *) ws;
-}
-
-static void
-fbdev_displaytarget_display(struct sw_winsys *ws,
-                            struct sw_displaytarget *dt,
-                            void *winsys_private,
-                            struct pipe_box *box)
-{
-   struct fbdev_sw_winsys *fbdev = fbdev_sw_winsys(ws);
-   struct fbdev_sw_displaytarget *src = fbdev_sw_displaytarget(dt);
-   const struct fbdev_sw_drawable *dst =
-      (const struct fbdev_sw_drawable *) winsys_private;
-   unsigned height, row_offset, row_len, i;
-   void *fbmem;
-
-   /* FIXME format conversion */
-   if (dst->format != src->format) {
-      assert(0);
-      return;
-   }
-
-   height = dst->height;
-   if (dst->y + dst->height > fbdev->rows) {
-      /* nothing to copy */
-      if (dst->y >= fbdev->rows)
-         return;
-
-      height = fbdev->rows - dst->y;
-   }
-
-   row_offset = util_format_get_stride(dst->format, dst->x);
-   row_len = util_format_get_stride(dst->format, dst->width);
-   if (row_offset + row_len > fbdev->stride) {
-      /* nothing to copy */
-      if (row_offset >= fbdev->stride)
-         return;
-
-      row_len = fbdev->stride - row_offset;
-   }
-
-   fbmem = mmap(0, fbdev->finfo.smem_len,
-         PROT_WRITE, MAP_SHARED, fbdev->fd, 0);
-   if (fbmem == MAP_FAILED)
-      return;
-
-   for (i = 0; i < height; i++) {
-      char *from = (char *) src->data + src->stride * i;
-      char *to = (char *) fbmem + fbdev->stride * (dst->y + i) + row_offset;
-
-      memcpy(to, from, row_len);
-   }
-
-   munmap(fbmem, fbdev->finfo.smem_len);
-}
-
-static void
-fbdev_displaytarget_unmap(struct sw_winsys *ws,
-                           struct sw_displaytarget *dt)
-{
-   struct fbdev_sw_displaytarget *fbdt = fbdev_sw_displaytarget(dt);
-   fbdt->mapped = NULL;
-}
-
-static void *
-fbdev_displaytarget_map(struct sw_winsys *ws,
-                        struct sw_displaytarget *dt,
-                        unsigned flags)
-{
-   struct fbdev_sw_displaytarget *fbdt = fbdev_sw_displaytarget(dt);
-   fbdt->mapped = fbdt->data;
-   return fbdt->mapped;
-}
-
-static void
-fbdev_displaytarget_destroy(struct sw_winsys *ws,
-                            struct sw_displaytarget *dt)
-{
-   struct fbdev_sw_displaytarget *fbdt = fbdev_sw_displaytarget(dt);
-
-   if (fbdt->data)
-      align_free(fbdt->data);
-
-   FREE(fbdt);
-}
-
-static struct sw_displaytarget *
-fbdev_displaytarget_create(struct sw_winsys *ws,
-                           unsigned tex_usage,
-                           enum pipe_format format,
-                           unsigned width, unsigned height,
-                           unsigned alignment,
-                           unsigned *stride)
-{
-   struct fbdev_sw_displaytarget *fbdt;
-   unsigned nblocksy, size, format_stride;
-
-   fbdt = CALLOC_STRUCT(fbdev_sw_displaytarget);
-   if (!fbdt)
-      return NULL;
-
-   fbdt->format = format;
-   fbdt->width = width;
-   fbdt->height = height;
-
-   format_stride = util_format_get_stride(format, width);
-   fbdt->stride = align(format_stride, alignment);
-
-   nblocksy = util_format_get_nblocksy(format, height);
-   size = fbdt->stride * nblocksy;
-
-   fbdt->data = align_malloc(size, alignment);
-   if (!fbdt->data) {
-      FREE(fbdt);
-      return NULL;
-   }
-
-   *stride = fbdt->stride;
-
-   return (struct sw_displaytarget *) fbdt;
-}
-
-static boolean
-fbdev_is_displaytarget_format_supported(struct sw_winsys *ws,
-                                        unsigned tex_usage,
-                                        enum pipe_format format)
-{
-   return TRUE;
-}
-
-static void
-fbdev_destroy(struct sw_winsys *ws)
-{
-   struct fbdev_sw_winsys *fbdev = fbdev_sw_winsys(ws);
-
-   FREE(fbdev);
-}
-
-struct sw_winsys *
-fbdev_create_sw_winsys(int fd)
-{
-   struct fbdev_sw_winsys *fbdev;
-
-   fbdev = CALLOC_STRUCT(fbdev_sw_winsys);
-   if (!fbdev)
-      return NULL;
-
-   fbdev->fd = fd;
-   if (ioctl(fbdev->fd, FBIOGET_FSCREENINFO, &fbdev->finfo)) {
-      FREE(fbdev);
-      return NULL;
-   }
-
-   fbdev->rows = fbdev->finfo.smem_len / fbdev->finfo.line_length;
-   fbdev->stride = fbdev->finfo.line_length;
-
-   fbdev->base.destroy = fbdev_destroy;
-   fbdev->base.is_displaytarget_format_supported =
-      fbdev_is_displaytarget_format_supported;
-
-   fbdev->base.displaytarget_create = fbdev_displaytarget_create;
-   fbdev->base.displaytarget_destroy = fbdev_displaytarget_destroy;
-   fbdev->base.displaytarget_map = fbdev_displaytarget_map;
-   fbdev->base.displaytarget_unmap = fbdev_displaytarget_unmap;
-
-   fbdev->base.displaytarget_display = fbdev_displaytarget_display;
-
-   return &fbdev->base;
-}
diff --git a/src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.h b/src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.h
deleted file mode 100644
index 23c723a4fc4..00000000000
--- a/src/gallium/winsys/sw/fbdev/fbdev_sw_winsys.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2010 LunarG Inc.
- *
- * 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.
- *
- * Authors:
- *    Chia-I Wu <[email protected]>
- */
-
-#ifndef FBDEV_SW_WINSYS
-#define FBDEV_SW_WINSYS
-
-struct sw_winsys;
-enum pipe_format;
-
-/* for pipe_screen::flush_frontbuffer */
-struct fbdev_sw_drawable {
-   enum pipe_format format;
-   unsigned x, y;
-   unsigned width, height;
-};
-
-struct sw_winsys *
-fbdev_create_sw_winsys(int fd);
-
-#endif /* FBDEV_SW_WINSYS */