diff options
| author | PFO <pfolinux@rdi-linux> | 2011-06-17 16:07:53 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2011-06-17 16:24:44 +0200 |
| commit | 06543d0bbd13f804a6c49f4978a65288211eeebc (patch) | |
| tree | e5e60ecae0d95370e788fedea6690910134e436f /src/mesa | |
| parent | d58e3fa353c5df8028413837a366a16ff6054015 (diff) | |
| parent | 5607823fe4ff35e11086efa6302d8fbacd315b06 (diff) | |
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/Android.mk | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/Android.mk | 33 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 16 |
3 files changed, 33 insertions, 20 deletions
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk index 9c9ab75964..f361aca3e4 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 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 3c430b9a05..fcd544de76 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 |