diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/Android.mk | 33 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 33 |
2 files changed, 49 insertions, 17 deletions
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 ) |