[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49956] branches/soc-2012-swiss_cheese/ source/blender/gpu/intern/gpu_functions.c: glMapBuffer is not implemented on Android.

Alexander Kuznetsov kuzsasha at gmail.com
Fri Aug 17 18:51:55 CEST 2012


Revision: 49956
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49956
Author:   alexk
Date:     2012-08-17 16:51:54 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
glMapBuffer is not implemented on Android. Fix for crash.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c

Modified: branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c	2012-08-17 14:43:20 UTC (rev 49955)
+++ branches/soc-2012-swiss_cheese/source/blender/gpu/intern/gpu_functions.c	2012-08-17 16:51:54 UTC (rev 49956)
@@ -298,12 +298,16 @@
 	else
 		init_framebuffers_ext();
 #endif
+#ifndef WITH_ANDROID
+/* Some android has unimplemented glUnMapBuffer? */
 	if(gpu_glMapBuffer!=NULL)
 	{
 		GPU_ext_config|=GPU_EXT_MAPBUFFER;
 		gpuBufferStartUpdate = gpuBufferStartUpdate_map;
 		gpuBufferFinishUpdate = gpuBufferFinishUpdate_map;		
 	} else
+#endif	
+	if(1)
 	{
 		gpuBufferStartUpdate = gpuBufferStartUpdate_buffer;
 		gpuBufferFinishUpdate = gpuBufferFinishUpdate_buffer;		




More information about the Bf-blender-cvs mailing list