Be sure to reconfigure after this commit.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
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
;;
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])
SUBDIRS += drivers/r300
endif
ifneq ($(filter r600g, $(MESA_GPU_DRIVERS)),)
-SUBDIRS += winsys/r600/drm drivers/r600
+SUBDIRS += drivers/r600
endif
endif
r600_asm.c \
r600_blit.c \
r600_buffer.c \
+ r600_hw_context.c \
r600_pipe.c \
r600_query.c \
r600_resource.c \
r600_state.c \
r600_texture.c \
r700_asm.c \
+ evergreen_hw_context.c \
evergreen_state.c \
eg_asm.c \
r600_translate.c \
* 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"
* 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"
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 \
env.Prepend(LIBS = [
st_dri,
radeonwinsys,
- r600winsys,
r600,
trace,
rbug,
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)),)
env.Prepend(LIBS = [
radeonwinsys,
r300,
- r600winsys,
r600,
])
# 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
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
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 \
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
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 \
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
SConscript([
'radeon/drm/SConscript',
])
-
- SConscript([
- 'r600/drm/SConscript',
- ])
+++ /dev/null
-# 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)
+++ /dev/null
-
-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:
+++ /dev/null
-C_SOURCES := \
- evergreen_hw_context.c \
- r600_hw_context.c
+++ /dev/null
-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')