fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600g: move all files from winsys/r600 into drivers/r600

Browse source 
Be sure to reconfigure after this commit.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2011-09-27 16:42:01 +02:00
parent 363ff84475
commit bf0baa7717
21 changed files with 13 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -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

2
configure.ac
View file

@ -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])

2
src/gallium/Android.mk
View file

@ -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

2
src/gallium/drivers/r600/Makefile.sources
View file

@ -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 \

2
src/gallium/winsys/r600/drm/evergreen_hw_context.c → src/gallium/drivers/r600/evergreen_hw_context.c
View file

@ -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"

2
src/gallium/winsys/r600/drm/r600_hw_context.c → src/gallium/drivers/r600/r600_hw_context.c
View file

@ -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"

0
src/gallium/winsys/r600/drm/r600_priv.h → src/gallium/drivers/r600/r600_hw_context_priv.h
View file

1
src/gallium/targets/dri-r600/Makefile
View file

@ -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 \

1
src/gallium/targets/dri-r600/SConscript
View file

@ -7,7 +7,6 @@ env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
env.Prepend(LIBS = [
st_dri,
radeonwinsys,
r600winsys,
r600,
trace,
rbug,

5
src/gallium/targets/egl-static/Makefile
View file

@ -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)),)

1
src/gallium/targets/egl-static/SConscript
View file

@ -104,7 +104,6 @@ if env['HAVE_DRM']:
env.Prepend(LIBS = [
radeonwinsys,
r300,
r600winsys,
r600,
])

5
src/gallium/targets/gbm/Makefile
View file

@ -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

1
src/gallium/targets/va-r600/Makefile
View file

@ -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 \

1
src/gallium/targets/vdpau-r600/Makefile
View file

@ -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

1
src/gallium/targets/xorg-r600/Makefile
View file

@ -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 \

1
src/gallium/targets/xvmc-r600/Makefile
View file

@ -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

4
src/gallium/winsys/SConscript
View file

@ -37,7 +37,3 @@ if env['dri']:
SConscript([
'radeon/drm/SConscript',
])
SConscript([
'r600/drm/SConscript',
])

41
src/gallium/winsys/r600/drm/Android.mk
View file

@ -1,41 +0,0 @@
# Mesa 3-D graphics library
#
# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
# 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)

15
src/gallium/winsys/r600/drm/Makefile
View file

@ -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:

3
src/gallium/winsys/r600/drm/Makefile.sources
View file

@ -1,3 +0,0 @@
C_SOURCES := \
evergreen_hw_context.c \
r600_hw_context.c

14
src/gallium/winsys/r600/drm/SConscript
View file

@ -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')