diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-10-08 18:58:38 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-10-08 18:58:38 +0300 |
commit | f23bf4cb109cb8f39f873c4f80acbec3f33b098c (patch) | |
tree | 99e084e178236efd4458481b3ab4ab737a567835 /source/blender/gpu/opengl | |
parent | 479dc766b5f9eee29fe86b869ee0fa9edb95e5fc (diff) |
Revert "BGL: Workaround broken bgl usage caused by GPU refactor"
This reverts commit f12b0373f322b710b9fa5cebb67bdf363ff90e9f.
Diffstat (limited to 'source/blender/gpu/opengl')
-rw-r--r-- | source/blender/gpu/opengl/gl_debug.cc | 2 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_state.cc | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index b2b05124463..797f9ff404c 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -200,7 +200,7 @@ void check_gl_error(const char *info) void check_gl_resources(const char *info) { - if (!(G.debug & G_DEBUG_GPU) || GPU_bgl_get()) { + if (!(G.debug & G_DEBUG_GPU)) { return; } diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc index 27c9b501add..cd24fa0e0e4 100644 --- a/source/blender/gpu/opengl/gl_state.cc +++ b/source/blender/gpu/opengl/gl_state.cc @@ -73,17 +73,13 @@ GLStateManager::GLStateManager(void) : StateManager() void GLStateManager::apply_state(void) { - if (!this->use_bgl) { - this->set_state(this->state); - this->set_mutable_state(this->mutable_state); - this->texture_bind_apply(); - this->image_bind_apply(); - } - /* This is needed by gpu_py_offscreen. */ + this->set_state(this->state); + this->set_mutable_state(this->mutable_state); + this->texture_bind_apply(); + this->image_bind_apply(); active_fb->apply_state(); }; -/* Will set all the states regardless of the current ones. */ void GLStateManager::force_state(void) { /* Little exception for clip distances since they need to keep the old count correct. */ |