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-08-31 16:14:47 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-08-31 16:14:47 +0300
commit1804eb57fd27fceb0ed113e3ef2f4a55db0d03c8 (patch)
tree003ceca6cdb280e5f6fc408b6833dea8b36f2bd6 /source/blender/gpu/intern/gpu_context_private.hh
parent1b3a0ae2316063d9817210a8fe5fd4588cee47cf (diff)
GPUImmediate: GL backend isolation
This is part of the Vulkan backend task T68990. This is mostly a cleanup, however, there is a small change: We don't use a special Vertex Array binding function for Immediate anymore and just reuse the one for batches. This might create a bit more state changes but this could be fixed easily if it causes perf regression. # Conflicts: # source/blender/gpu/intern/gpu_context.cc
Diffstat (limited to 'source/blender/gpu/intern/gpu_context_private.hh')
-rw-r--r--source/blender/gpu/intern/gpu_context_private.hh2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh
index 04b347d1bff..b32406bfc44 100644
--- a/source/blender/gpu/intern/gpu_context_private.hh
+++ b/source/blender/gpu/intern/gpu_context_private.hh
@@ -30,6 +30,7 @@
#include "GPU_context.h"
#include "gpu_framebuffer_private.hh"
+#include "gpu_immediate_private.hh"
#include "gpu_shader_private.hh"
#include "gpu_state_private.hh"
@@ -48,6 +49,7 @@ struct GPUContext {
blender::gpu::FrameBuffer *active_fb = NULL;
GPUMatrixState *matrix_state = NULL;
blender::gpu::GPUStateManager *state_manager = NULL;
+ blender::gpu::Immediate *imm = NULL;
/**
* All 4 window framebuffers.