diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-29 02:29:44 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-30 14:11:02 +0300 |
| commit | f69c7a7ff99374574e37021117c6247e002d60d9 (patch) | |
| tree | 7ea720b6f9f2bc044963eb1eecef8486e03f992e | |
| parent | 807817c0c4b6cef6acef8360394ae000be278109 (diff) | |
Cleanup: GPUContext: Remove default_framebuffer_
This is now handled by FrameBuffer wrapping.
| -rw-r--r-- | source/blender/gpu/intern/gpu_context.cc | 6 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_context_private.hh | 1 | ||||
| -rw-r--r-- | source/blender/gpu/opengl/gl_context.cc | 4 | ||||
| -rw-r--r-- | source/blender/gpu/opengl/gl_context.hh | 2 |
4 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/gpu/intern/gpu_context.cc b/source/blender/gpu/intern/gpu_context.cc index 9b4705ae6a3..6101ac5a0d2 100644 --- a/source/blender/gpu/intern/gpu_context.cc +++ b/source/blender/gpu/intern/gpu_context.cc @@ -127,12 +127,6 @@ GLuint GPU_vao_default(void) return static_cast<GLContext *>(active_ctx)->default_vao_; } -GLuint GPU_framebuffer_default(void) -{ - BLI_assert(active_ctx); /* need at least an active context */ - return static_cast<GLContext *>(active_ctx)->default_framebuffer_; -} - GLuint GPU_vao_alloc(void) { GLuint new_vao_id = 0; diff --git a/source/blender/gpu/intern/gpu_context_private.hh b/source/blender/gpu/intern/gpu_context_private.hh index 664f4e2f676..0374df9bbc5 100644 --- a/source/blender/gpu/intern/gpu_context_private.hh +++ b/source/blender/gpu/intern/gpu_context_private.hh @@ -79,7 +79,6 @@ struct GPUContext { }; GLuint GPU_vao_default(void); -GLuint GPU_framebuffer_default(void); /* These require a gl ctx bound. */ GLuint GPU_buf_alloc(void); diff --git a/source/blender/gpu/opengl/gl_context.cc b/source/blender/gpu/opengl/gl_context.cc index 8ec100c0d99..8c1022c8fd1 100644 --- a/source/blender/gpu/opengl/gl_context.cc +++ b/source/blender/gpu/opengl/gl_context.cc @@ -46,10 +46,6 @@ using namespace blender::gpu; GLContext::GLContext(void *ghost_window, GLSharedOrphanLists &shared_orphan_list) : shared_orphan_list_(shared_orphan_list) { - default_framebuffer_ = ghost_window ? - GHOST_GetDefaultOpenGLFramebuffer((GHOST_WindowHandle)ghost_window) : - 0; - glGenVertexArrays(1, &default_vao_); float data[4] = {0.0f, 0.0f, 0.0f, 1.0f}; diff --git a/source/blender/gpu/opengl/gl_context.hh b/source/blender/gpu/opengl/gl_context.hh index 35121a960ba..c19731f217a 100644 --- a/source/blender/gpu/opengl/gl_context.hh +++ b/source/blender/gpu/opengl/gl_context.hh @@ -63,8 +63,6 @@ class GLContext : public GPUContext { public: /** Default VAO for procedural draw calls. */ GLuint default_vao_; - /** Default framebuffer object for some GL implementation. */ - GLuint default_framebuffer_; /** VBO for missing vertex attrib binding. Avoid undefined behavior on some implementation. */ GLuint default_attr_vbo_; /** |