Merge Mesa 9.2.0

2 files changed, 0 insertions, 51 deletions

diff --git a/dist/Mesa/src/gallium/targets/dri-r600/Makefile b/dist/Mesa/src/gallium/targets/dri-r600/Makefile
deleted file mode 100644
index 0c4de203d..000000000
--- a/dist/Mesa/src/gallium/targets/dri-r600/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-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/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/rbug/librbug.a \
-	$(TOP)/src/gallium/drivers/noop/libnoop.a
-
-C_SOURCES = \
-	target.c \
-	$(COMMON_GALLIUM_SOURCES) \
-	$(DRIVER_SOURCES)
-
-DRIVER_DEFINES = \
-	-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP
-
-include ../Makefile.dri
-
-DRI_LIB_DEPS +=
-
-symlinks:
diff --git a/dist/Mesa/src/gallium/targets/dri-r600/SConscript b/dist/Mesa/src/gallium/targets/dri-r600/SConscript
deleted file mode 100644
index 1df11a874..000000000
--- a/dist/Mesa/src/gallium/targets/dri-r600/SConscript
+++ /dev/null
@@ -1,25 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-env.Append(CPPDEFINES = ['GALLIUM_RBUG', 'GALLIUM_TRACE'])
-
-env.Prepend(LIBS = [
-    st_dri,
-    r600winsys,
-    r600,
-    trace,
-    rbug,
-    mesa,
-    glsl,
-    gallium,
-    COMMON_DRI_DRM_OBJECTS
-])
-
-module = env.SharedLibrary(
-    target ='r600_dri.so',
-    source = 'target.c',
-    SHLIBPREFIX = '',
-)
-
-env.Alias('dri-r600', module)