bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Potential thread render bug/crashing:

Browse Source 
Discovered I forget to re-enable the 'imbuf load' and 'envmap' mutexes.
This commit is contained in:
Ton Roosendaal 2006-02-09 19:58:32 +00:00
parent 5e3d30c276
commit 9c003086fe
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/render/intern/source/initrender.c
View File

@ -661,12 +661,6 @@ void initparts(Render *re)
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
// exported to other files, belongs in include... later
SDL_mutex *render_abuf_lock=NULL, *load_ibuf_lock=NULL;
/* **************************************************************** */
/* sticky texture coords */

6
source/blender/render/intern/source/pipeline.c
View File

@ -107,7 +107,7 @@ Render R;
/* ********* alloc and free ******** */
SDL_mutex *malloc_lock= NULL;
SDL_mutex *malloc_lock= NULL, *load_ibuf_lock=NULL;
void *RE_mallocN(int len, char *name)
{
@ -756,7 +756,8 @@ static void threaded_tile_processor(Render *re)
/* set threadsafety */
R.test_break= thread_break;
malloc_lock = SDL_CreateMutex();
malloc_lock= SDL_CreateMutex();
load_ibuf_lock= SDL_CreateMutex();
/* timer loop demands to sleep when no parts are left */
nextpa= find_next_part(re);
@ -809,6 +810,7 @@ static void threaded_tile_processor(Render *re)
/* restore threadsafety */
if(malloc_lock) SDL_DestroyMutex(malloc_lock); malloc_lock= NULL;
if(load_ibuf_lock) SDL_DestroyMutex(load_ibuf_lock); load_ibuf_lock= NULL;
g_break= 0;
BLI_end_threads(&threads);