From 0872c28717ccf76057fcaae0efb5e467f2215309 Mon Sep 17 00:00:00 2001 From: pfo Date: Tue, 31 May 2011 15:21:08 +0200 Subject: Adds support for r300 [experimental/tbd] --- src/gallium/drivers/r300/Android.mk | 56 ++++++++++++++++++++++++++++++++++++ src/gallium/targets/Android.mk | 5 +++- src/gallium/winsys/radeon/Android.mk | 33 +++++++++++++++++++++ src/gralloc/gralloc_gem_radeon.c | 4 +-- src/mesa/drivers/Android.mk | 51 +++++++++++++++++++++++++++----- 5 files changed, 139 insertions(+), 10 deletions(-) create mode 100755 src/gallium/drivers/r300/Android.mk create mode 100755 src/gallium/winsys/radeon/Android.mk diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk new file mode 100755 index 0000000000..0690170386 --- /dev/null +++ b/src/gallium/drivers/r300/Android.mk @@ -0,0 +1,56 @@ +ifeq ($(strip $(MESA_BUILD_R600G)),true) + +LOCAL_PATH := $(call my-dir) + +# from Makefile +C_SOURCES = \ + r300_blit.c \ + r300_chipset.c \ + r300_context.c \ + r300_debug.c \ + r300_emit.c \ + r300_flush.c \ + r300_fs.c \ + r300_hyperz.c \ + r300_query.c \ + r300_render.c \ + r300_render_stencilref.c \ + r300_render_translate.c \ + r300_resource.c \ + r300_screen.c \ + r300_screen_buffer.c \ + r300_state.c \ + r300_state_derived.c \ + r300_vs.c \ + r300_vs_draw.c \ + r300_texture.c \ + r300_texture_desc.c \ + r300_tgsi_to_rc.c \ + r300_transfer.c + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(C_SOURCES) + +LOCAL_CFLAGS := \ + -std=c99 \ + -fvisibility=hidden \ + -Wno-sign-compare + +LOCAL_C_INCLUDES := \ + external/mesa/src/gallium/include \ + external/mesa/src/gallium/auxiliary \ + external/drm \ + external/drm/include/drm \ + external/mesa/src/mesa/drivers/dri/r300/compiler \ + external/mesa/gallium/winsys/drm/radeon/core + +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 2101cd3495..8de7cf6e9f 100644 --- a/src/gallium/targets/Android.mk +++ b/src/gallium/targets/Android.mk @@ -67,11 +67,14 @@ LOCAL_SHARED_LIBRARIES += \ endif # MESA_BUILD_I915G ifeq ($(strip $(MESA_BUILD_R600G)),true) -LOCAL_CFLAGS += -D_EGL_PIPE_R600 +LOCAL_CFLAGS += -D_EGL_PIPE_R600 +#-D_EGL_PIPE_R300 LOCAL_STATIC_LIBRARIES := \ libmesa_pipe_r600 \ libmesa_winsys_r600 \ $(LOCAL_STATIC_LIBRARIES) +# libmesa_pipe_r300 \ +# libmesa_winsys_r300 \ LOCAL_SHARED_LIBRARIES += \ libdrm \ libdrm_radeon diff --git a/src/gallium/winsys/radeon/Android.mk b/src/gallium/winsys/radeon/Android.mk new file mode 100755 index 0000000000..2726ddde8c --- /dev/null +++ b/src/gallium/winsys/radeon/Android.mk @@ -0,0 +1,33 @@ +ifeq ($(strip $(MESA_BUILD_R600G)),true) + +LOCAL_PATH := $(call my-dir) + +# from drm/Makefile +C_SOURCES = \ + radeon_drm_bo.c \ + radeon_drm_common.c \ + radeon_drm_cs.c + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := \ + $(addprefix drm/, $(C_SOURCES)) + +LOCAL_CFLAGS := \ + -std=c99 \ + -fvisibility=hidden \ + -Wno-sign-compare + +LOCAL_C_INCLUDES := \ + external/mesa/include \ + external/mesa/src/gallium/include \ + external/mesa/src/gallium/auxiliary \ + external/mesa/src/gallium/drivers/r300 \ + external/drm \ + external/drm/include/drm + +LOCAL_MODULE := libmesa_winsys_r300 + +include $(BUILD_STATIC_LIBRARY) + +endif # MESA_BUILD_R600G diff --git a/src/gralloc/gralloc_gem_radeon.c b/src/gralloc/gralloc_gem_radeon.c index c7382e039d..4bd384c027 100644 --- a/src/gralloc/gralloc_gem_radeon.c +++ b/src/gralloc/gralloc_gem_radeon.c @@ -227,12 +227,12 @@ drm_gem_radeon_init(struct drm_module_t *drm) drm->gem = (void *) info; - ret = eg_init_tile_config(info); +/* ret = eg_init_tile_config(info); if (ret) { radeon_bo_manager_gem_dtor(info->bufmgr); free(info); return ret; - } + }*/ drm_gem_radeon_init_features(drm); diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk index 7fb540af11..0b6cd73df3 100644 --- a/src/mesa/drivers/Android.mk +++ b/src/mesa/drivers/Android.mk @@ -2,6 +2,42 @@ LOCAL_PATH := $(call my-dir) +# from dri/R300/Makefile +R300_DRIVER_SOURCES = \ + radeon_bo_legacy.c \ + radeon_buffer_objects.c \ + radeon_common_context.c \ + radeon_common.c \ + radeon_cs_legacy.c \ + radeon_dma.c \ + radeon_debug.c \ + radeon_fbo.c \ + radeon_lock.c \ + radeon_mipmap_tree.c \ + radeon_pixel_read.c \ + radeon_queryobj.c \ + radeon_span.c \ + radeon_texture.c \ + radeon_tex_copy.c \ + radeon_tex_getimage.c \ + radeon_tile.c \ + radeon_screen.c \ + r300_blit.c \ + r300_context.c \ + r300_draw.c \ + r300_cmdbuf.c \ + r300_state.c \ + r300_render.c \ + r300_tex.c \ + r300_texstate.c \ + r300_vertprog.c \ + r300_fragprog_common.c \ + r300_shader.c \ + radeon_mesa_to_rc.c \ + r300_emit.c \ + r300_swtcl.c + + # from dri/i915/Makefile i915_DRIVER_SOURCES = \ i830_context.c \ @@ -228,16 +264,16 @@ LOCAL_MODULE_PATH := $(common_MODULE_PATH) include $(BUILD_SHARED_LIBRARY) endif # MESA_BUILD_I915C -ifeq ($(strip $(MESA_BUILD_I965C)),true) +ifeq ($(strip $(MESA_BUILD_R600G)),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(common_SOURCES) \ - $(i965_DRIVER_SOURCES) + $(R300_DRIVER_SOURCES) LOCAL_CFLAGS := \ $(common_CFLAGS) \ - -DI965 + -DR300 LOCAL_C_INCLUDES := \ $(common_C_INCLUDES) \ @@ -249,10 +285,11 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \ $(common_SHARED_LIBRARIES) \ - libdrm_intel + libdrm_radeon -LOCAL_MODULE := i965_dri +LOCAL_MODULE := r300_dri LOCAL_MODULE_PATH := $(common_MODULE_PATH) -include $(BUILD_SHARED_LIBRARY) -endif # MESA_BUILD_I965C +#include $(BUILD_SHARED_LIBRARY) +endif # MESA_BUILD_R600G + -- cgit v1.2.3