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>2020-09-08 04:18:49 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-09-08 05:15:50 +0300
commitccc512cc619dc9f0e6fd79270a7a96ece34d23b5 (patch)
treeda728c4f3745fc352a5e223502ca8734c3c1f01b /source/blender/gpu/intern/gpu_immediate.cc
parentca8ffc523e3d08fc55c5cf000fa9fc3888950bf7 (diff)
GPUImmediate: Make activation / deactivation implicit
This avoids unecessary complexity. Also makes the GPUImmediate threadsafe by using a threadlocal imm variable.
Diffstat (limited to 'source/blender/gpu/intern/gpu_immediate.cc')
-rw-r--r--source/blender/gpu/intern/gpu_immediate.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc
index dd3e5bea604..9fc5e03a796 100644
--- a/source/blender/gpu/intern/gpu_immediate.cc
+++ b/source/blender/gpu/intern/gpu_immediate.cc
@@ -39,12 +39,7 @@
using namespace blender::gpu;
-static Immediate *imm = NULL;
-
-void immInit(void)
-{
- /* TODO Remove */
-}
+static thread_local Immediate *imm = NULL;
void immActivate(void)
{
@@ -56,11 +51,6 @@ void immDeactivate(void)
imm = NULL;
}
-void immDestroy(void)
-{
- /* TODO Remove */
-}
-
GPUVertFormat *immVertexFormat(void)
{
GPU_vertformat_clear(&imm->vertex_format);