[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27077] trunk/blender/source/blender/ editors/render: OSX : Bugfix [#21293] add OpenMP apple gcc bug workaround for render preview

Damien Plisson damien.plisson at yahoo.fr
Mon Feb 22 11:29:50 CET 2010


Revision: 27077
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27077
Author:   damien78
Date:     2010-02-22 11:29:49 +0100 (Mon, 22 Feb 2010)

Log Message:
-----------
OSX : Bugfix [#21293] add OpenMP apple gcc bug workaround for render preview

All openMP calls from a background thread need to have this thread var init workaround

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/Makefile
    trunk/blender/source/blender/editors/render/SConscript
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/Makefile
===================================================================
--- trunk/blender/source/blender/editors/render/Makefile	2010-02-22 09:22:36 UTC (rev 27076)
+++ trunk/blender/source/blender/editors/render/Makefile	2010-02-22 10:29:49 UTC (rev 27077)
@@ -54,3 +54,9 @@
 # own include 
 
 CPPFLAGS += -I../include 
+
+ifeq ($(OS), darwin)
+    ifeq ($(WITH_BF_OPENMP), true)
+        CPPFLAGS += -DPARALLEL=1
+    endif
+endif

Modified: trunk/blender/source/blender/editors/render/SConscript
===================================================================
--- trunk/blender/source/blender/editors/render/SConscript	2010-02-22 09:22:36 UTC (rev 27076)
+++ trunk/blender/source/blender/editors/render/SConscript	2010-02-22 10:29:49 UTC (rev 27077)
@@ -24,4 +24,8 @@
 if env['USE_QTKIT']:
    env.Append(CFLAGS=['-DUSE_QTKIT'])
 
+if env['OURPLATFORM'] == 'darwin':
+    if env['WITH_BF_OPENMP']:
+       env.Append(CFLAGS=['-DARALLEL=1'])
+
 env.BlenderLib ( 'bf_editors_render', sources, Split(incs), [], libtype=['core'], priority=[45])

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2010-02-22 09:22:36 UTC (rev 27076)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2010-02-22 10:29:49 UTC (rev 27077)
@@ -100,6 +100,13 @@
 #define PR_XMAX		200
 #define PR_YMAX		195
 
+#if defined(__APPLE__) && (PARALLEL == 1) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)
+/* ************** libgomp (Apple gcc 4.2.1) TLS bug workaround *************** */
+#include <pthread.h>
+extern pthread_key_t gomp_tls_key;
+static void *thread_tls_data;
+#endif
+
 /* XXX */
 static int qtest() {return 0;}
 /* XXX */
@@ -1098,6 +1105,11 @@
 {
 	ShaderPreview *sp= customdata;
 
+#if defined(__APPLE__) && (PARALLEL == 1) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)
+	// Workaround for Apple gcc 4.2.1 omp vs background thread bug
+	pthread_setspecific (gomp_tls_key, thread_tls_data);
+#endif
+	
 	if(sp->pr_method == PR_ICON_RENDER)
 		icon_preview_startjob(customdata, stop, do_update);
 	else
@@ -1127,7 +1139,12 @@
 	WM_jobs_customdata(steve, sp, shader_preview_free);
 	WM_jobs_timer(steve, 0.1, NC_MATERIAL, NC_MATERIAL);
 	WM_jobs_callbacks(steve, common_preview_startjob, NULL, NULL);
-	
+
+#if defined(__APPLE__) && (PARALLEL == 1) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)
+	// Workaround for Apple gcc 4.2.1 omp vs background thread bug
+	thread_tls_data = pthread_getspecific(gomp_tls_key);
+#endif
+		
 	WM_jobs_start(CTX_wm_manager(C), steve);
 }
 
@@ -1154,6 +1171,11 @@
 	WM_jobs_timer(steve, 0.1, NC_MATERIAL, NC_MATERIAL);
 	WM_jobs_callbacks(steve, common_preview_startjob, NULL, shader_preview_updatejob);
 	
+#if defined(__APPLE__) && (PARALLEL == 1) && (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)
+	// Workaround for Apple gcc 4.2.1 omp vs background thread bug
+	thread_tls_data = pthread_getspecific(gomp_tls_key);
+#endif
+	
 	WM_jobs_start(CTX_wm_manager(C), steve);
 }
 





More information about the Bf-blender-cvs mailing list