From 15c7fa460b93039a1676cc08a218101f92681190 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsapountzis@gmail.com>
Date: Sun, 21 Mar 2010 19:33:17 +0200
Subject: Revert "gallium: add soft screen helper"

This reverts commit f87a5f6499f51f651c2a9f2d4682875b22926905.
---
 src/gallium/auxiliary/target-helpers/soft_screen.c | 73 ----------------------
 src/gallium/auxiliary/target-helpers/soft_screen.h | 12 ----
 2 files changed, 85 deletions(-)
 delete mode 100644 src/gallium/auxiliary/target-helpers/soft_screen.c
 delete mode 100644 src/gallium/auxiliary/target-helpers/soft_screen.h

(limited to 'src/gallium/auxiliary/target-helpers')

diff --git a/src/gallium/auxiliary/target-helpers/soft_screen.c b/src/gallium/auxiliary/target-helpers/soft_screen.c
deleted file mode 100644
index 00d386ee1d..0000000000
--- a/src/gallium/auxiliary/target-helpers/soft_screen.c
+++ /dev/null
@@ -1,73 +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, 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 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
- * THE COPYRIGHT HOLDERS, AUTHORS 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.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- *
- **************************************************************************/
-
-#include "target-helpers/soft_screen.h"
-#include "softpipe/sp_public.h"
-#include "llvmpipe/lp_public.h"
-#include "cell/ppu/cell_public.h"
-#include "util/u_debug.h"
-
-/**
- * Choose and create a software renderer screen.
- */
-struct pipe_screen *
-gallium_soft_create_screen( struct sw_winsys *winsys )
-{
-   const char *default_driver = NULL;
-   const char *driver = NULL;
-   struct pipe_screen *screen = NULL;
-
-#if defined(GALLIUM_CELL)
-   default_driver = "cell";
-#elif defined(GALLIUM_LLVMPIPE)
-   default_driver = "llvmpipe";
-#elif defined(GALLIUM_SOFTPIPE)
-   default_driver = "softpipe";
-#else
-   default_driver = "";
-#endif
-
-   driver = debug_get_option("GALLIUM_DRIVER", default_driver);
-
-#if defined(GALLIUM_CELL)
-   if (screen == NULL && strcmp(driver, "cell") == 0)
-      screen = cell_create_screen( winsys );
-#endif
-
-#if defined(GALLIUM_LLVMPIPE)
-   if (screen == NULL && strcmp(driver, "llvmpipe") == 0)
-      screen = llvmpipe_create_screen( winsys );
-#endif
-
-#if defined(GALLIUM_SOFTPIPE)
-   if (screen == NULL)
-      screen = softpipe_create_screen( winsys );
-#endif
-
-   return screen;
-}
diff --git a/src/gallium/auxiliary/target-helpers/soft_screen.h b/src/gallium/auxiliary/target-helpers/soft_screen.h
deleted file mode 100644
index 5c1012644a..0000000000
--- a/src/gallium/auxiliary/target-helpers/soft_screen.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef SOFT_SCREEN_HELPER_H
-#define SOFT_SCREEN_HELPER_H
-
-#include "pipe/p_compiler.h"
-
-struct pipe_screen;
-struct sw_winsys;
-
-struct pipe_screen *
-gallium_soft_create_screen( struct sw_winsys *winsys );
-
-#endif
-- 
cgit v1.2.3