blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

GPU: Make the creation of opengl shaders more stable. 

This commit possibly fixes the T58938.
The crash happens when a shader that is created in a rendering context is deleted and another shader with the same name/program of the deleted one is created in the same context and used in another context.
This commit is contained in:
Germano Cavalcante 2019-03-11 12:22:33 -03:00
parent 2703c405a4
commit 005084ef62
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/gpu/intern/gpu_codegen.c
View File

@ -1254,8 +1254,6 @@ void GPU_nodes_extract_dynamic_inputs(GPUShader *shader, ListBase *inputs, ListB
if (!shader)
return;
GPU_shader_bind(shader);
for (node = nodes->first; node; node = node->next) {
int z = 0;
for (input = node->inputs.first; input; input = next, z++) {
@ -1284,8 +1282,6 @@ void GPU_nodes_extract_dynamic_inputs(GPUShader *shader, ListBase *inputs, ListB
}
}
}
GPU_shader_unbind();
}
/* Node Link Functions */
@ -1983,6 +1979,13 @@ void GPU_pass_compile(GPUPass *pass, const char *shname)
pass->shader = NULL;
}
pass->compiled = true;
if (!BLI_thread_is_main()) {
/* For some drivers, you must use the program at least once in the
* rendering context that it is created. */
glUseProgram(GPU_shader_get_program(pass->shader));
glUseProgram(0);
}
}
}