summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPFO <pfolinux@rdi-linux>2011-06-17 16:07:53 +0200
committerHugues Hiegel <hugues@hiegel.fr>2011-06-17 16:24:44 +0200
commit06543d0bbd13f804a6c49f4978a65288211eeebc (patch)
treee5e60ecae0d95370e788fedea6690910134e436f
parentd58e3fa353c5df8028413837a366a16ff6054015 (diff)
parent5607823fe4ff35e11086efa6302d8fbacd315b06 (diff)
Merge cleanups for deliveryHEADr300
-rw-r--r--src/Android.mk12
-rwxr-xr-xsrc/gallium/drivers/r300/Android.mk4
-rw-r--r--src/gallium/targets/Android.mk17
-rwxr-xr-xsrc/gallium/winsys/radeon/Android.mk4
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm_bo.c9
-rw-r--r--src/gralloc/gralloc_gem_radeon.c4
-rw-r--r--src/mesa/Android.mk4
-rw-r--r--src/mesa/drivers/Android.mk33
-rw-r--r--src/mesa/vbo/vbo_exec_api.c16
9 files changed, 67 insertions, 36 deletions
diff --git a/src/Android.mk b/src/Android.mk
index 327550c..edbdb11 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -40,6 +40,7 @@ MESA_BUILD_I965C := false
# Gallium drivers
MESA_BUILD_GALLIUM := false
MESA_BUILD_I915G := false
+MESA_BUILD_R300 := false
MESA_BUILD_R600G := false
MESA_BUILD_SWRAST := false
@@ -77,9 +78,18 @@ MESA_BUILD_INTEL := true
MESA_DO_BUILD := true
endif
-ifeq ($(strip $(BOARD_USES_R600G)),true)
+ifeq ($(strip $(BOARD_USES_R300)),true)
MESA_BUILD_CLASSIC := true
MESA_BUILD_GALLIUM := true
+MESA_BUILD_R300 := true
+# gralloc
+MESA_BUILD_RADEON := true
+
+MESA_DO_BUILD := true
+endif
+
+ifeq ($(strip $(BOARD_USES_R600G)),true)
+MESA_BUILD_GALLIUM := true
MESA_BUILD_R600G := true
# gralloc
MESA_BUILD_RADEON := true
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index acb9a87..779ba67 100755
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
+ifeq ($(strip $(MESA_BUILD_R300)),true)
LOCAL_PATH := $(call my-dir)
@@ -50,4 +50,4 @@ LOCAL_MODULE := libmesa_pipe_r300
include $(BUILD_STATIC_LIBRARY)
-endif # MESA_BUILD_R600G
+endif # MESA_BUILD_R300
diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk
index 55cd354..ea35abf 100644
--- a/src/gallium/targets/Android.mk
+++ b/src/gallium/targets/Android.mk
@@ -66,11 +66,9 @@ LOCAL_SHARED_LIBRARIES += \
libdrm_intel
endif # MESA_BUILD_I915G
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
-LOCAL_CFLAGS += -D_EGL_PIPE_R600 -D_EGL_PIPE_R300
+ifeq ($(strip $(MESA_BUILD_R300)),true)
+LOCAL_CFLAGS += -D_EGL_PIPE_R300
LOCAL_STATIC_LIBRARIES := \
- libmesa_pipe_r600 \
- libmesa_winsys_r600 \
libmesa_pipe_r300 \
libmesa_winsys_r300 \
libr300_dri \
@@ -78,6 +76,17 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_SHARED_LIBRARIES += \
libdrm \
libdrm_radeon
+endif # MESA_BUILD_R300
+
+ifeq ($(strip $(MESA_BUILD_R600G)),true)
+LOCAL_CFLAGS += -D_EGL_PIPE_R600
+LOCAL_STATIC_LIBRARIES := \
+ libmesa_pipe_r600 \
+ libmesa_winsys_r600 \
+ $(LOCAL_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES += \
+ libdrm \
+ libdrm_radeon
endif # MESA_BUILD_R600G
LOCAL_MODULE := libGLES_mesa
diff --git a/src/gallium/winsys/radeon/Android.mk b/src/gallium/winsys/radeon/Android.mk
index 2726ddd..6e6d157 100755
--- a/src/gallium/winsys/radeon/Android.mk
+++ b/src/gallium/winsys/radeon/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
+ifeq ($(strip $(MESA_BUILD_R300)),true)
LOCAL_PATH := $(call my-dir)
@@ -30,4 +30,4 @@ LOCAL_MODULE := libmesa_winsys_r300
include $(BUILD_STATIC_LIBRARY)
-endif # MESA_BUILD_R600G
+endif # MESA_BUILD_R300
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index fa20d7e..b582cf4 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -39,6 +39,10 @@
#include <xf86drm.h>
#include <errno.h>
+#define RADEON_BO_FLAGS_MACRO_TILE 1
+#define RADEON_BO_FLAGS_MICRO_TILE 2
+#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
+
#ifdef ANDROID
extern void* __mmap2(void*, size_t, int, int, int, size_t);
@@ -58,11 +62,6 @@ static void* android_mmap2(void *addr, size_t size, int prot, int flags, int fd,
#endif /* ANDROID */
-
-#define RADEON_BO_FLAGS_MACRO_TILE 1
-#define RADEON_BO_FLAGS_MICRO_TILE 2
-#define RADEON_BO_FLAGS_MICRO_TILE_SQUARE 0x20
-
extern const struct pb_vtbl radeon_bo_vtbl;
diff --git a/src/gralloc/gralloc_gem_radeon.c b/src/gralloc/gralloc_gem_radeon.c
index addb341..469a148 100644
--- a/src/gralloc/gralloc_gem_radeon.c
+++ b/src/gralloc/gralloc_gem_radeon.c
@@ -223,12 +223,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/Android.mk b/src/mesa/Android.mk
index 9c9ab75..f361aca 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -4,8 +4,8 @@ include $(LOCAL_PATH)/sources.mak
common_CFLAGS := \
-DPTHREADS \
- -DFEATURE_ES1=0 \
- -DFEATURE_ES2=0 \
+ -DFEATURE_ES1=1 \
+ -DFEATURE_ES2=1 \
-fvisibility=hidden \
-Wno-sign-compare
diff --git a/src/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk
index afa6ced..4555dc1 100644
--- a/src/mesa/drivers/Android.mk
+++ b/src/mesa/drivers/Android.mk
@@ -297,7 +297,36 @@ LOCAL_MODULE_PATH := $(common_MODULE_PATH)
include $(BUILD_SHARED_LIBRARY)
endif # MESA_BUILD_I915C
-ifeq ($(strip $(MESA_BUILD_R600G)),true)
+ifeq ($(strip $(MESA_BUILD_I965C)),true)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ $(common_SOURCES) \
+ $(i965_DRIVER_SOURCES)
+
+LOCAL_CFLAGS := \
+ $(common_CFLAGS) \
+ -DI965
+
+LOCAL_C_INCLUDES := \
+ $(common_C_INCLUDES) \
+ external/mesa/src/mesa/drivers/dri/intel \
+ external/drm/intel
+
+LOCAL_STATIC_LIBRARIES := \
+ $(common_STATIC_LIBRARIES)
+
+LOCAL_SHARED_LIBRARIES := \
+ $(common_SHARED_LIBRARIES) \
+ libdrm_intel
+
+LOCAL_MODULE := i965_dri
+LOCAL_MODULE_PATH := $(common_MODULE_PATH)
+
+include $(BUILD_SHARED_LIBRARY)
+endif # MESA_BUILD_I965C
+
+ifeq ($(strip $(MESA_BUILD_R300)),true)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@@ -328,5 +357,5 @@ LOCAL_MODULE := libr300_dri
include $(BUILD_STATIC_LIBRARY)
-endif # MESA_BUILD_R600G
+endif # MESA_BUILD_R300
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 3c430b9..fcd544d 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -428,23 +428,7 @@ do { \
#include "vbo_attrib_tmp.h"
-/**
- * Flush (draw) vertices.
- * \param unmap - leave VBO unmapped after flushing?
- */
-/*static void
-vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
-{
- if (exec->vtx.vert_count || unmap) {
- vbo_exec_vtx_flush( exec, unmap );
- }
- if (exec->vtx.vertex_size) {
- vbo_exec_copy_to_current( exec );
- reset_attrfv( exec );
- }
-}
-*/
#if FEATURE_beginend