android: use r300g's copy of r300 compiler

4 files changed, 40 insertions, 88 deletions

diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index 8e9933e788..be1b120426 100644
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-# from Makefile
+# from Makefile, omitting the last two files
 C_SOURCES = \
 	r300_blit.c \
 	r300_chipset.c \
@@ -48,7 +48,40 @@ C_SOURCES = \
 	r300_texture.c \
 	r300_texture_desc.c \
 	r300_tgsi_to_rc.c \
-	r300_transfer.c
+	r300_transfer.c \
+	\
+	compiler/radeon_code.c \
+	compiler/radeon_compiler.c \
+	compiler/radeon_compiler_util.c \
+	compiler/radeon_emulate_branches.c \
+	compiler/radeon_emulate_loops.c \
+	compiler/radeon_program.c \
+	compiler/radeon_program_print.c \
+	compiler/radeon_opcodes.c \
+	compiler/radeon_program_alu.c \
+	compiler/radeon_program_pair.c \
+	compiler/radeon_program_tex.c \
+	compiler/radeon_pair_translate.c \
+	compiler/radeon_pair_schedule.c \
+	compiler/radeon_pair_regalloc.c \
+	compiler/radeon_pair_dead_sources.c \
+	compiler/radeon_dataflow.c \
+	compiler/radeon_dataflow_deadcode.c \
+	compiler/radeon_dataflow_swizzles.c \
+	compiler/radeon_list.c \
+	compiler/radeon_optimize.c \
+	compiler/radeon_remove_constants.c \
+	compiler/radeon_rename_regs.c \
+	compiler/radeon_variable.c \
+	compiler/r3xx_fragprog.c \
+	compiler/r300_fragprog.c \
+	compiler/r300_fragprog_swizzle.c \
+	compiler/r300_fragprog_emit.c \
+	compiler/r500_fragprog.c \
+	compiler/r500_fragprog_emit.c \
+	compiler/r3xx_vertprog.c \
+	compiler/r3xx_vertprog_dump.c \
+	compiler/memory_pool.c
 
 include $(CLEAR_VARS)
 
@@ -58,7 +91,9 @@ LOCAL_SRC_FILES := \
 LOCAL_CFLAGS := -std=c99
 
 LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/src/mesa/drivers/dri/r300/compiler \
+	$(MESA_TOP)/src/mapi \
+	$(MESA_TOP)/src/glsl \
+	$(MESA_TOP)/src/mesa \
 	$(DRM_TOP) \
 	$(DRM_TOP)/include/drm
 
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk
index 7b9a8950c2..36a0cd7b11 100644
--- a/src/gallium/targets/Android.mk
+++ b/src/gallium/targets/Android.mk
@@ -78,7 +78,7 @@ LOCAL_SHARED_LIBRARIES += libdrm libdrm_intel
 endif
 
 ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
-gallium_DRIVERS += libmesa_pipe_r300 libmesa_winsys_r300 libmesa_r300compiler
+gallium_DRIVERS += libmesa_pipe_r300 libmesa_winsys_r300
 LOCAL_CFLAGS += -D_EGL_PIPE_R300=1
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
@@ -131,7 +131,7 @@ endif # GALLIUM_LLVM_VERSION
 # Notes about the order here:
 #
 #  * libmesa_st_egl depends on libmesa_winsys_sw in $(gallium_DRIVERS)
-#  * libmesa_r300compiler in $(gallium_DRIVERS) depends on libmesa_st_mesa and
+#  * libmesa_pipe_r300 in $(gallium_DRIVERS) depends on libmesa_st_mesa and
 #    libmesa_glsl
 #  * libmesa_st_mesa depends on libmesa_glsl
 #  * libmesa_glsl depends on libmesa_glsl_utils
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index 3e46838024..83f65d7382 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -30,9 +30,6 @@ SUBDIRS :=
 ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
 SUBDIRS += $(LOCAL_PATH)/drivers/Android.mk
 endif
-ifneq ($(filter r300g, $(MESA_GPU_DRIVERS)),)
-SUBDIRS += $(LOCAL_PATH)/drivers/dri/r300/compiler/Android.mk
-endif
 
 include $(LOCAL_PATH)/sources.mak
 
diff --git a/src/mesa/drivers/dri/r300/compiler/Android.mk b/src/mesa/drivers/dri/r300/compiler/Android.mk
deleted file mode 100644
index 4050922838..0000000000
--- a/src/mesa/drivers/dri/r300/compiler/Android.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  7.11
-#
-# Copyright (C) 2011 Chia-I Wu <olvaffe@gmail.com>
-# Copyright (C) 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.
-
-# Android.mk for r300 compiler
-
-LOCAL_PATH := $(call my-dir)
-
-# from Makefile
-C_SOURCES = \
-		radeon_code.c \
-		radeon_compiler.c \
-		radeon_compiler_util.c \
-		radeon_emulate_branches.c \
-		radeon_emulate_loops.c \
-		radeon_program.c \
-		radeon_program_print.c \
-		radeon_opcodes.c \
-		radeon_program_alu.c \
-		radeon_program_pair.c \
-		radeon_program_tex.c \
-		radeon_pair_translate.c \
-		radeon_pair_schedule.c \
-		radeon_pair_regalloc.c \
-		radeon_pair_dead_sources.c \
-		radeon_dataflow.c \
-		radeon_dataflow_deadcode.c \
-		radeon_dataflow_swizzles.c \
-		radeon_list.c \
-		radeon_optimize.c \
-		radeon_remove_constants.c \
-		radeon_rename_regs.c \
-		radeon_variable.c \
-		r3xx_fragprog.c \
-		r300_fragprog.c \
-		r300_fragprog_swizzle.c \
-		r300_fragprog_emit.c \
-		r500_fragprog.c \
-		r500_fragprog_emit.c \
-		r3xx_vertprog.c \
-		r3xx_vertprog_dump.c \
-		memory_pool.c
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	$(C_SOURCES)
-
-LOCAL_CFLAGS := \
-	-std=c99
-
-LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/src/mapi \
-	$(MESA_TOP)/src/glsl \
-	$(MESA_TOP)/src/mesa
-
-LOCAL_MODULE := libmesa_r300compiler
-
-include $(MESA_COMMON_MK)
-include $(BUILD_STATIC_LIBRARY)