diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-09-08 04:22:35 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-09-08 05:15:50 +0300 |
commit | 33b25b6a9e86082a40a24b14bb0a6aad708dfb11 (patch) | |
tree | b894bf4971554bc6fe07af6efb58bfd22e7fc59a /source/blender/gpu/opengl | |
parent | a30ad3634d2ed489d0c285b2ea77bc1c69e23826 (diff) |
GPUTexture: Remove unused functions and avoid GPU_texture_opengl_bindcode
This is a cleanup.
Diffstat (limited to 'source/blender/gpu/opengl')
-rw-r--r-- | source/blender/gpu/opengl/gl_framebuffer.cc | 4 | ||||
-rw-r--r-- | source/blender/gpu/opengl/gl_texture.hh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc index d0644b356ac..61270fe0acc 100644 --- a/source/blender/gpu/opengl/gl_framebuffer.cc +++ b/source/blender/gpu/opengl/gl_framebuffer.cc @@ -187,7 +187,7 @@ void GLFrameBuffer::update_attachments(void) glFramebufferTexture(GL_FRAMEBUFFER, gl_attachment, 0, 0); continue; } - GLuint gl_tex = GPU_texture_opengl_bindcode(attach.tex); + GLuint gl_tex = static_cast<GLTexture *>(unwrap(attach.tex))->tex_id_; if (attach.layer > -1 && GPU_texture_cube(attach.tex) && !GPU_texture_array(attach.tex)) { /* Could be avoided if ARB_direct_state_access is required. In this case * #glFramebufferTextureLayer would bind the correct face. */ @@ -216,7 +216,7 @@ void GLFrameBuffer::update_attachments(void) GPUAttachmentType type = GPU_FB_COLOR_ATTACHMENT0 + i; GPUAttachment &attach = attachments_[type]; if (attach.tex != NULL) { - gl_tex = GPU_texture_opengl_bindcode(attach.tex); + gl_tex = static_cast<GLTexture *>(unwrap(attach.tex))->tex_id_; } else if (gl_tex != 0) { GLenum gl_attachment = to_gl(type); diff --git a/source/blender/gpu/opengl/gl_texture.hh b/source/blender/gpu/opengl/gl_texture.hh index bdb8a4df4b7..13e546eb879 100644 --- a/source/blender/gpu/opengl/gl_texture.hh +++ b/source/blender/gpu/opengl/gl_texture.hh @@ -46,6 +46,7 @@ namespace gpu { class GLTexture : public Texture { friend class GLStateManager; + friend class GLFrameBuffer; private: /** All samplers states. */ |