From 0865af4b42bc82816f751e3a96971375f2adbfb4 Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Tue, 11 Jan 2011 14:46:09 -0500 Subject: [PATCH] noop: remove dead dri target Signed-off-by: Jerome Glisse --- configure.ac | 13 ---- src/gallium/targets/dri-noop/Makefile | 34 ---------- src/gallium/targets/dri-noop/SConscript | 31 --------- src/gallium/targets/dri-noop/swrast_drm_api.c | 63 ------------------- 4 files changed, 141 deletions(-) delete mode 100644 src/gallium/targets/dri-noop/Makefile delete mode 100644 src/gallium/targets/dri-noop/SConscript delete mode 100644 src/gallium/targets/dri-noop/swrast_drm_api.c diff --git a/configure.ac b/configure.ac index b6f7d86371c..d9220c86b59 100644 --- a/configure.ac +++ b/configure.ac @@ -1701,19 +1701,6 @@ if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xau fi fi -dnl -dnl Gallium noop configuration -dnl -AC_ARG_ENABLE([gallium-noop], - [AS_HELP_STRING([--enable-gallium-noop], - [build gallium radeon @<:@default=disabled@:>@])], - [enable_gallium_noop="$enableval"], - [enable_gallium_noop=auto]) -if test "x$enable_gallium_noop" = xyes; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS noop" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-noop" -fi - dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" diff --git a/src/gallium/targets/dri-noop/Makefile b/src/gallium/targets/dri-noop/Makefile deleted file mode 100644 index 21c5f4f9f2a..00000000000 --- a/src/gallium/targets/dri-noop/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = noop_dri.so - -DRIVER_DEFINES = \ - -D__NOT_HAVE_DRM_H - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/sw/libdrisw.a \ - $(TOP)/src/gallium/winsys/sw/dri/libswdri.a \ - $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/noop/libnoop.a - -SWRAST_COMMON_GALLIUM_SOURCES = \ - $(TOP)/src/mesa/drivers/dri/common/utils.c \ - $(TOP)/src/mesa/drivers/dri/common/drisw_util.c \ - $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c - -C_SOURCES = \ - swrast_drm_api.c \ - $(SWRAST_COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -ASM_SOURCES = - -include ../Makefile.dri - -INCLUDES += \ - -I$(TOP)/src/gallium/winsys/sw/dri - -symlinks: diff --git a/src/gallium/targets/dri-noop/SConscript b/src/gallium/targets/dri-noop/SConscript deleted file mode 100644 index 9c04ee66318..00000000000 --- a/src/gallium/targets/dri-noop/SConscript +++ /dev/null @@ -1,31 +0,0 @@ -Import('*') - -env = drienv.Clone() - -env.Append(CPPPATH = [ - '#/src/gallium/winsys/sw/dri', -]) - -env.Prepend(LIBS = [ - st_drisw, - ws_dri, - noop, - mesa, - glsl, - gallium, - COMMON_DRI_SW_OBJECTS -]) - -env.Prepend(LIBS = [noop]) - -swrastg_sources = [ - 'swrast_drm_api.c' -] - -module = env.LoadableModule( - target ='noop_dri.so', - source = swrastg_sources, - SHLIBPREFIX = '', -) - -env.Alias('dri-noop', module) diff --git a/src/gallium/targets/dri-noop/swrast_drm_api.c b/src/gallium/targets/dri-noop/swrast_drm_api.c deleted file mode 100644 index a99779f1837..00000000000 --- a/src/gallium/targets/dri-noop/swrast_drm_api.c +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************** - * - * Copyright 2009, VMware, Inc. - * All Rights Reserved. - * Copyright 2010 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, 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_compiler.h" -#include "util/u_memory.h" -#include "dri_sw_winsys.h" -#include "noop/noop_public.h" - -#include "target-helpers/inline_debug_helper.h" -#include "target-helpers/inline_sw_helper.h" - - -struct pipe_screen * -drisw_create_screen(struct drisw_loader_funcs *lf) -{ - struct sw_winsys *winsys = NULL; - struct pipe_screen *screen = NULL; - - winsys = dri_create_sw_winsys(lf); - if (winsys == NULL) - return NULL; - - screen = noop_screen_create(winsys); - if (!screen) - goto fail; - - screen = debug_screen_wrap(screen); - - return screen; - -fail: - if (winsys) - winsys->destroy(winsys); - - return NULL; -} - -/* vim: set sw=3 ts=8 sts=3 expandtab: */ -- 2.30.2