Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-07-19 16:48:13 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-07-19 17:13:15 +0300
commit5037dd8abdf9335e998141336d4e15f81580c491 (patch)
tree0f6a1df0db24e27c3dbef47cf858132f0b975a66 /source/blender/gpu/intern/gpu_shader_interface.c
parent3882d0943b33c42d1dbe67d10d2432c0e7191959 (diff)
GPU: Add GC to FBOs and UBOs and centralize all GCs
GPUFrameBuffers were being free when no context was attached or in the wrong gl context. This make sure this does not happen again. You can now safely free any gl resource from any thread (well as long as it's not used anymore!).
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader_interface.c')
-rw-r--r--source/blender/gpu/intern/gpu_shader_interface.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_shader_interface.c b/source/blender/gpu/intern/gpu_shader_interface.c
index 4b8413d0cc3..54c5f41bbd3 100644
--- a/source/blender/gpu/intern/gpu_shader_interface.c
+++ b/source/blender/gpu/intern/gpu_shader_interface.c
@@ -29,9 +29,11 @@
* GPU shader interface (C --> GLSL)
*/
-#include "gpu_batch_private.h"
#include "GPU_shader_interface.h"
-#include "GPU_vertex_array_id.h"
+
+#include "gpu_batch_private.h"
+#include "gpu_context_private.h"
+
#include <stdlib.h>
#include <stddef.h>
#include <string.h>