Adds r300/dri support for GLES_mesa

5 files changed, 51 insertions, 16 deletions

diff --git a/src/Android.mk b/src/Android.mk
index 204b380e7d..327550c271 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -78,6 +78,7 @@ MESA_DO_BUILD := true
 endif
 
 ifeq ($(strip $(BOARD_USES_R600G)),true)
+MESA_BUILD_CLASSIC := true
 MESA_BUILD_GALLIUM := true
 MESA_BUILD_R600G := true
 # gralloc
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index 0690170386..acb9a87b83 100755
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -48,9 +48,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_MODULE := libmesa_pipe_r300
 
-LOCAL_SHARED_LIBRARIES += \
-	r300_dri
-
 include $(BUILD_STATIC_LIBRARY)
 
 endif # MESA_BUILD_R600G
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk
index 8de7cf6e9f..55cd354a5d 100644
--- a/src/gallium/targets/Android.mk
+++ b/src/gallium/targets/Android.mk
@@ -67,14 +67,14 @@ LOCAL_SHARED_LIBRARIES += \
 endif # MESA_BUILD_I915G
 
 ifeq ($(strip $(MESA_BUILD_R600G)),true)
-LOCAL_CFLAGS += -D_EGL_PIPE_R600 
-#-D_EGL_PIPE_R300
+LOCAL_CFLAGS += -D_EGL_PIPE_R600 -D_EGL_PIPE_R300
 LOCAL_STATIC_LIBRARIES := \
 	libmesa_pipe_r600 \
 	libmesa_winsys_r600 \
+	libmesa_pipe_r300 \
+	libmesa_winsys_r300 \
+	libr300_dri \
 	$(LOCAL_STATIC_LIBRARIES)
-#	libmesa_pipe_r300 \
-#	libmesa_winsys_r300 \
 LOCAL_SHARED_LIBRARIES += \
 	libdrm \
 	libdrm_radeon
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index 0b6cd73df3..afa6ced8b8 100644
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -36,6 +36,39 @@ R300_DRIVER_SOURCES = \
 	radeon_mesa_to_rc.c \
 	r300_emit.c \
 	r300_swtcl.c
+R300_DRIVER_DEPEND_SOURCES = \
+	memory_pool.c \
+	r300_fragprog.c \
+	r300_fragprog_emit.c \
+	r300_fragprog_swizzle.c \
+	r3xx_fragprog.c \
+	r3xx_vertprog.c \
+	r3xx_vertprog_dump.c \
+	r500_fragprog.c \
+	r500_fragprog_emit.c \
+	radeon_code.c \
+	radeon_compiler.c \
+	radeon_compiler_util.c \
+	radeon_dataflow.c \
+	radeon_dataflow_deadcode.c \
+	radeon_dataflow_swizzles.c \
+	radeon_emulate_branches.c \
+	radeon_emulate_loops.c \
+	radeon_opcodes.c \
+	radeon_optimize.c \
+	radeon_pair_regalloc.c \
+	radeon_pair_schedule.c \
+	radeon_pair_translate.c \
+	radeon_program_alu.c \
+	radeon_program.c \
+	radeon_program_pair.c \
+	radeon_program_print.c \
+	radeon_program_tex.c \
+	radeon_remove_constants.c \
+	radeon_rename_regs.c
+
+R300_DRIVER_SOURCES := $(addprefix dri/r300/, $(R300_DRIVER_SOURCES))
+R300_DRIVER_DEPEND_SOURCES := $(addprefix dri/r300/compiler/, $(R300_DRIVER_DEPEND_SOURCES))
 
 
 # from dri/i915/Makefile
@@ -269,16 +302,19 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
 	$(common_SOURCES) \
-	$(R300_DRIVER_SOURCES)
+	$(R300_DRIVER_SOURCES) \
+	$(R300_DRIVER_DEPEND_SOURCES)
 
 LOCAL_CFLAGS := \
 	$(common_CFLAGS) \
-	-DR300
+	-DRADEON_R300 \
+	-std=c99
 
 LOCAL_C_INCLUDES := \
 	$(common_C_INCLUDES) \
-	external/mesa/src/mesa/drivers/dri/intel \
-	external/drm/intel
+	external/mesa/src/mesa/drivers/dri/r300 \
+	external/mesa/src/mesa/drivers/dri/r300/server \
+	external/drm/radeon
 
 LOCAL_STATIC_LIBRARIES := \
 	$(common_STATIC_LIBRARIES)
@@ -287,9 +323,10 @@ LOCAL_SHARED_LIBRARIES := \
 	$(common_SHARED_LIBRARIES) \
 	libdrm_radeon
 
-LOCAL_MODULE := r300_dri
-LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+LOCAL_MODULE := libr300_dri
+#LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+
+include $(BUILD_STATIC_LIBRARY)
 
-#include $(BUILD_SHARED_LIBRARY)
 endif # MESA_BUILD_R600G
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 9328e3ea07..3c430b9a05 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -432,7 +432,7 @@ do {									\
  * Flush (draw) vertices.
  * \param  unmap - leave VBO unmapped after flushing?
  */
-static void
+/*static void
 vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
 {
    if (exec->vtx.vert_count || unmap) {
@@ -444,7 +444,7 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
       reset_attrfv( exec );
    }
 }
-
+*/
 #if FEATURE_beginend