diff options
21 files changed, 13 insertions, 93 deletions
diff --git a/Android.mk b/Android.mk index a5c9ebc5fa2..29453bc342f 100644 --- a/Android.mk +++ b/Android.mk @@ -149,7 +149,7 @@ ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += libmesa_pipe_r300 endif ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) -gallium_DRIVERS += libmesa_pipe_r600 libmesa_winsys_r600 +gallium_DRIVERS += libmesa_pipe_r600 endif endif diff --git a/configure.ac b/configure.ac index 20426533afd..49e81ad17c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1824,7 +1824,7 @@ if test "x$with_gallium_drivers" != x; then ;; xr600) GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" - gallium_check_st "r600/drm radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600" + gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600" ;; xnouveau) PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk index 3deb94b62ea..41c59b13c6f 100644 --- a/src/gallium/Android.mk +++ b/src/gallium/Android.mk @@ -56,7 +56,7 @@ ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),) SUBDIRS += drivers/r300 endif ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),) -SUBDIRS += winsys/r600/drm drivers/r600 +SUBDIRS += drivers/r600 endif endif diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources index 0366394e5a2..e7813ef51c8 100644 --- a/src/gallium/drivers/r600/Makefile.sources +++ b/src/gallium/drivers/r600/Makefile.sources @@ -2,6 +2,7 @@ C_SOURCES := \ r600_asm.c \ r600_blit.c \ r600_buffer.c \ + r600_hw_context.c \ r600_pipe.c \ r600_query.c \ r600_resource.c \ @@ -9,6 +10,7 @@ C_SOURCES := \ r600_state.c \ r600_texture.c \ r700_asm.c \ + evergreen_hw_context.c \ evergreen_state.c \ eg_asm.c \ r600_translate.c \ diff --git a/src/gallium/winsys/r600/drm/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c index c83560e04ff..3779dd480f8 100644 --- a/src/gallium/winsys/r600/drm/evergreen_hw_context.c +++ b/src/gallium/drivers/r600/evergreen_hw_context.c @@ -24,7 +24,7 @@ * Jerome Glisse */ #include "r600.h" -#include "r600_priv.h" +#include "r600_hw_context_priv.h" #include "r600_pipe.h" #include "evergreend.h" #include "util/u_memory.h" diff --git a/src/gallium/winsys/r600/drm/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index fa7a8b6f841..d261e2a4a63 100644 --- a/src/gallium/winsys/r600/drm/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -23,7 +23,7 @@ * Authors: * Jerome Glisse */ -#include "r600_priv.h" +#include "r600_hw_context_priv.h" #include "r600_pipe.h" #include "r600d.h" #include "util/u_memory.h" diff --git a/src/gallium/winsys/r600/drm/r600_priv.h b/src/gallium/drivers/r600/r600_hw_context_priv.h index 1f18e0ee405..1f18e0ee405 100644 --- a/src/gallium/winsys/r600/drm/r600_priv.h +++ b/src/gallium/drivers/r600/r600_hw_context_priv.h diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile index 2d7463008fe..2995b58876b 100644 --- a/src/gallium/targets/dri-r600/Makefile +++ b/src/gallium/targets/dri-r600/Makefile @@ -6,7 +6,6 @@ LIBNAME = r600_dri.so PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/rbug/librbug.a \ diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript index c10d65b595a..73238f336ff 100644 --- a/src/gallium/targets/dri-r600/SConscript +++ b/src/gallium/targets/dri-r600/SConscript @@ -7,7 +7,6 @@ env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE']) env.Prepend(LIBS = [ st_dri, radeonwinsys, - r600winsys, r600, trace, rbug, diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 2c07455ee4a..17a578d43af 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -129,13 +129,14 @@ endif endif # r600 -ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_R600=1 egl_LIBS += \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a endif +endif # vmwgfx ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),) diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index dfd05437231..a929d600349 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -104,7 +104,6 @@ if env['HAVE_DRM']: env.Prepend(LIBS = [ radeonwinsys, r300, - r600winsys, r600, ]) diff --git a/src/gallium/targets/gbm/Makefile b/src/gallium/targets/gbm/Makefile index c516588f95f..3f52aae6f33 100644 --- a/src/gallium/targets/gbm/Makefile +++ b/src/gallium/targets/gbm/Makefile @@ -82,7 +82,6 @@ r300_LIBS = \ # r600 pipe driver r600_LIBS = \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a @@ -130,10 +129,12 @@ pipe_SOURCES += pipe_r300.c endif endif -ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),) pipe_TARGETS += $(PIPE_PREFIX)r600.so pipe_SOURCES += pipe_r600.c endif +endif ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),) pipe_TARGETS += $(PIPE_PREFIX)vmwgfx.so diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile index d09a3aa8ad2..3aee430000d 100644 --- a/src/gallium/targets/va-r600/Makefile +++ b/src/gallium/targets/va-r600/Makefile @@ -9,7 +9,6 @@ DRIVER_INCLUDES = PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ diff --git a/src/gallium/targets/vdpau-r600/Makefile b/src/gallium/targets/vdpau-r600/Makefile index c2d95af295a..17805e326c3 100644 --- a/src/gallium/targets/vdpau-r600/Makefile +++ b/src/gallium/targets/vdpau-r600/Makefile @@ -6,7 +6,6 @@ LIBBASENAME = vdpau_r600 PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a diff --git a/src/gallium/targets/xorg-r600/Makefile b/src/gallium/targets/xorg-r600/Makefile index 4577ba605a5..08d5635e633 100644 --- a/src/gallium/targets/xorg-r600/Makefile +++ b/src/gallium/targets/xorg-r600/Makefile @@ -13,7 +13,6 @@ DRIVER_DEFINES = \ DRIVER_PIPES = \ $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \ $(TOP)/src/gallium/drivers/r600/libr600.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/galahad/libgalahad.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ diff --git a/src/gallium/targets/xvmc-r600/Makefile b/src/gallium/targets/xvmc-r600/Makefile index a10a42d18ed..7be866510d6 100644 --- a/src/gallium/targets/xvmc-r600/Makefile +++ b/src/gallium/targets/xvmc-r600/Makefile @@ -6,7 +6,6 @@ LIBBASENAME = XvMCr600 PIPE_DRIVERS = \ $(TOP)/src/gallium/drivers/r600/libr600.a \ $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/auxiliary/libgallium.a diff --git a/src/gallium/winsys/SConscript b/src/gallium/winsys/SConscript index 9f36d225e10..ee86ba4cd0b 100644 --- a/src/gallium/winsys/SConscript +++ b/src/gallium/winsys/SConscript @@ -37,7 +37,3 @@ if env['dri']: SConscript([ 'radeon/drm/SConscript', ]) - - SConscript([ - 'r600/drm/SConscript', - ]) diff --git a/src/gallium/winsys/r600/drm/Android.mk b/src/gallium/winsys/r600/drm/Android.mk deleted file mode 100644 index b1c0ab684bb..00000000000 --- a/src/gallium/winsys/r600/drm/Android.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu <[email protected]> -# Copyright (C) 2010-2011 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. - -LOCAL_PATH := $(call my-dir) - -# get C_SOURCES -include $(LOCAL_PATH)/Makefile.sources - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(C_SOURCES) - -LOCAL_CFLAGS := -std=c99 - -LOCAL_C_INCLUDES := \ - $(GALLIUM_TOP)/drivers/r600 - -LOCAL_MODULE := libmesa_winsys_r600 - -include $(GALLIUM_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) diff --git a/src/gallium/winsys/r600/drm/Makefile b/src/gallium/winsys/r600/drm/Makefile deleted file mode 100644 index ccaab0b4170..00000000000 --- a/src/gallium/winsys/r600/drm/Makefile +++ /dev/null @@ -1,15 +0,0 @@ - -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = r600winsys - -# get C_SOURCES -include Makefile.sources - -LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/r600 \ - -I$(TOP)/include \ - -include ../../../Makefile.template - -symlinks: diff --git a/src/gallium/winsys/r600/drm/Makefile.sources b/src/gallium/winsys/r600/drm/Makefile.sources deleted file mode 100644 index c8a4658324f..00000000000 --- a/src/gallium/winsys/r600/drm/Makefile.sources +++ /dev/null @@ -1,3 +0,0 @@ -C_SOURCES := \ - evergreen_hw_context.c \ - r600_hw_context.c diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript deleted file mode 100644 index cbefd25e289..00000000000 --- a/src/gallium/winsys/r600/drm/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -Import('*') - -env = env.Clone() - -r600_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') - -env.Append(CPPPATH = '#/src/gallium/drivers/r600') - -r600winsys = env.ConvenienceLibrary( - target ='r600winsys', - source = r600_sources, -) - -Export('r600winsys') |