diff options
| -rw-r--r-- | src/Android.mk | 12 | ||||
| -rwxr-xr-x | src/gallium/drivers/r300/Android.mk | 4 | ||||
| -rw-r--r-- | src/gallium/state_trackers/egl/android/native_android.cpp | 4 | ||||
| -rw-r--r-- | src/gallium/targets/Android.mk | 17 | ||||
| -rwxr-xr-x | src/gallium/winsys/radeon/Android.mk | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/Android.mk | 33 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 33 |
7 files changed, 77 insertions, 30 deletions
diff --git a/src/Android.mk b/src/Android.mk index 327550c271..edbdb110dd 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 acb9a87b83..779ba673a5 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/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp index 7687ec86a6..a584d54db4 100644 --- a/src/gallium/state_trackers/egl/android/native_android.cpp +++ b/src/gallium/state_trackers/egl/android/native_android.cpp @@ -413,11 +413,7 @@ android_display_create_window_surface(struct native_display *ndpy, asurf = CALLOC_STRUCT(android_surface); if (!asurf) - { - LOGE("Can't allocate android surface structure... X_x "); return NULL; - } - LOGI("Android surface struct allocated :)"); asurf->adpy = adpy; asurf->win = win; diff --git a/src/gallium/targets/Android.mk b/src/gallium/targets/Android.mk index 55cd354a5d..ea35abf4e8 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 2726ddde8c..6e6d157624 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/mesa/drivers/Android.mk b/src/mesa/drivers/Android.mk index afa6ced8b8..4555dc1a27 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 d9656b3caf..fcd544de76 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -428,22 +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 @@ -548,6 +533,24 @@ static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j ) /** + * 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 ); + } +} + + +/** * Called via glBegin. */ static void GLAPIENTRY vbo_exec_Begin( GLenum mode ) |