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-10-08 18:58:38 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-10-08 18:58:38 +0300
commitf23bf4cb109cb8f39f873c4f80acbec3f33b098c (patch)
tree99e084e178236efd4458481b3ab4ab737a567835 /source/blender/gpu/intern/gpu_state.cc
parent479dc766b5f9eee29fe86b869ee0fa9edb95e5fc (diff)
Revert "BGL: Workaround broken bgl usage caused by GPU refactor"
This reverts commit f12b0373f322b710b9fa5cebb67bdf363ff90e9f.
Diffstat (limited to 'source/blender/gpu/intern/gpu_state.cc')
-rw-r--r--source/blender/gpu/intern/gpu_state.cc35
1 files changed, 3 insertions, 32 deletions
diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc
index 44cc11155bb..44ad9cc9a84 100644
--- a/source/blender/gpu/intern/gpu_state.cc
+++ b/source/blender/gpu/intern/gpu_state.cc
@@ -317,39 +317,10 @@ void GPU_apply_state(void)
Context::get()->state_manager->apply_state();
}
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name BGL workaround
- *
- * bgl makes direct GL calls that makes our state tracking out of date.
- * This flag make it so that the pyGPU calls will not override the state set by
- * bgl functions.
- * \{ */
-
-void GPU_bgl_start(void)
-{
- StateManager &state_manager = *(Context::get()->state_manager);
- if (state_manager.use_bgl == false) {
- /* Expected by many addons (see T80169, T81289).
- * This will reset the blend function. */
- GPU_blend(GPU_BLEND_NONE);
- state_manager.apply_state();
- state_manager.use_bgl = true;
- }
-}
-
-void GPU_bgl_end(void)
-{
- StateManager &state_manager = *(Context::get()->state_manager);
- state_manager.use_bgl = false;
- /* Resync state tracking. */
- state_manager.force_state();
-}
-
-bool GPU_bgl_get(void)
+/* Will set all the states regardless of the current ones. */
+void GPU_force_state(void)
{
- return Context::get()->state_manager->use_bgl;
+ Context::get()->state_manager->force_state();
}
/** \} */