X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fframebuffer_backend.cpp;h=18566ac3c2553fd82ea1dd71ab735dc0f3cd3168;hb=HEAD;hp=1adcb7f93515c2eef68b4419957704fb81640520;hpb=160e9eea29bd10034733d59507fa1bcca36be401;p=libs%2Fgl.git diff --git a/source/backends/opengl/framebuffer_backend.cpp b/source/backends/opengl/framebuffer_backend.cpp index 1adcb7f9..8ba947df 100644 --- a/source/backends/opengl/framebuffer_backend.cpp +++ b/source/backends/opengl/framebuffer_backend.cpp @@ -19,7 +19,6 @@ namespace Msp { namespace GL { OpenGLFramebuffer::OpenGLFramebuffer(bool is_system): - id(0), status(is_system ? GL_FRAMEBUFFER_COMPLETE : GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT) { if(!is_system) @@ -33,43 +32,24 @@ OpenGLFramebuffer::OpenGLFramebuffer(bool is_system): } } -OpenGLFramebuffer::~OpenGLFramebuffer() +OpenGLFramebuffer::OpenGLFramebuffer(OpenGLFramebuffer &&other): + id(other.id), + status(other.status) { - if(id) - glDeleteFramebuffers(1, &id); + other.id = 0; } -FrameFormat OpenGLFramebuffer::get_system_format() +OpenGLFramebuffer::~OpenGLFramebuffer() { - FrameFormat format; - - if(EXT_framebuffer_object) - { - int value; - glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_BACK, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value); - if(value==GL_NONE) - glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_FRONT, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value); - if(value!=GL_NONE) - format = (format,COLOR_ATTACHMENT); - - glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_DEPTH, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value); - if(value!=GL_NONE) - format = (format,DEPTH_ATTACHMENT); - - glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER, GL_STENCIL, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &value); - if(value!=GL_NONE) - format = (format,STENCIL_ATTACHMENT); - } - - return format; + if(id) + glDeleteFramebuffers(1, &id); + if(resolve_id) + glDeleteFramebuffers(1, &resolve_id); } -void OpenGLFramebuffer::get_system_size(unsigned &width, unsigned &height) +void OpenGLFramebuffer::set_system_format(const FrameFormat &fmt) { - int view[4]; - glGetIntegerv(GL_VIEWPORT, view); - width = view[2]; - height = view[3]; + static_cast(this)->format = fmt; } bool OpenGLFramebuffer::is_format_supported(const FrameFormat &fmt) @@ -91,45 +71,84 @@ bool OpenGLFramebuffer::is_format_supported(const FrameFormat &fmt) return true; } +void OpenGLFramebuffer::format_changed(const FrameFormat &format) +{ + if(format.get_samples()>1 && !resolve_id) + { + if(ARB_direct_state_access) + glCreateFramebuffers(1, &resolve_id); + else + glGenFramebuffers(1, &resolve_id); + } +} + void OpenGLFramebuffer::require_layered() { static Require _req(ARB_geometry_shader4); } +void OpenGLFramebuffer::resize_system(unsigned w, unsigned h) +{ + Framebuffer &self = *static_cast(this); + self.width = w; + self.height = h; +} + void OpenGLFramebuffer::update(unsigned mask) const { - const FrameFormat &format = static_cast(this)->format; + const Framebuffer &self = *static_cast(this); + + update(mask, false); + if(self.has_resolve_attachments()) + { + if(!ARB_direct_state_access) + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, resolve_id); + + update(mask, true); + + if(!ARB_direct_state_access) + glBindFramebuffer(GL_DRAW_FRAMEBUFFER, id); + } +} + +void OpenGLFramebuffer::update(unsigned mask, bool resolve) const +{ + const Framebuffer &self = *static_cast(this); + unsigned obj_id = (resolve ? resolve_id : id); + Texture *Framebuffer::Attachment::*member = (resolve ? &Framebuffer::Attachment::resolve : &Framebuffer::Attachment::tex); + vector color_bufs; - color_bufs.reserve(format.size()); + color_bufs.reserve(self.format.size()); unsigned i = 0; - for(FrameAttachment a: format) + for(FrameAttachment a: self.format) { GLenum gl_attach_point = get_gl_attachment(a); if(mask&(1<(this)->attachments[i]; - if(attch.tex) + const Framebuffer::Attachment &attch = self.attachments[i]; + Texture *tex = attch.*member; + if(tex) { if(ARB_direct_state_access) { - if(attch.tex->target==GL_TEXTURE_2D || attch.tex->target==GL_TEXTURE_2D_MULTISAMPLE || attch.layer<0) - glNamedFramebufferTexture(id, gl_attach_point, attch.tex->id, attch.level); + if(tex->target==GL_TEXTURE_2D || tex->target==GL_TEXTURE_2D_MULTISAMPLE || attch.layer<0) + glNamedFramebufferTexture(obj_id, gl_attach_point, tex->id, attch.level); else - glNamedFramebufferTextureLayer(id, gl_attach_point, attch.tex->id, attch.level, attch.layer); + glNamedFramebufferTextureLayer(obj_id, gl_attach_point, tex->id, attch.level, attch.layer); } - else if(attch.tex->target==GL_TEXTURE_2D || attch.tex->target==GL_TEXTURE_2D_MULTISAMPLE) - glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, attch.tex->target, attch.tex->id, attch.level); + else if(tex->target==GL_TEXTURE_2D || tex->target==GL_TEXTURE_2D_MULTISAMPLE) + glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, tex->target, tex->id, attch.level); else if(attch.layer<0) - glFramebufferTexture(GL_FRAMEBUFFER, gl_attach_point, attch.tex->id, attch.level); - else if(attch.tex->target==GL_TEXTURE_2D_ARRAY) - glFramebufferTextureLayer(GL_FRAMEBUFFER, gl_attach_point, attch.tex->id, attch.level, attch.layer); - else if(attch.tex->target==GL_TEXTURE_3D) - glFramebufferTexture3D(GL_FRAMEBUFFER, gl_attach_point, attch.tex->target, attch.tex->id, attch.level, attch.layer); - else if(attch.tex->target==GL_TEXTURE_CUBE_MAP) - glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, get_gl_cube_face(static_cast(attch.layer)), attch.tex->id, attch.level); + glFramebufferTexture(GL_FRAMEBUFFER, gl_attach_point, tex->id, attch.level); + else if(tex->target==GL_TEXTURE_2D_ARRAY) + glFramebufferTextureLayer(GL_FRAMEBUFFER, gl_attach_point, tex->id, attch.level, attch.layer); + else if(tex->target==GL_TEXTURE_3D) + glFramebufferTexture3D(GL_FRAMEBUFFER, gl_attach_point, tex->target, tex->id, attch.level, attch.layer); + else if(tex->target==GL_TEXTURE_CUBE_MAP) + glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, get_gl_cube_face(static_cast(attch.layer)), tex->id, attch.level); } else if(ARB_direct_state_access) - glNamedFramebufferTexture(id, gl_attach_point, 0, 0); + glNamedFramebufferTexture(obj_id, gl_attach_point, 0, 0); else glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, GL_TEXTURE_2D, 0, 0); } @@ -148,8 +167,8 @@ void OpenGLFramebuffer::update(unsigned mask) const { /* ARB_direct_state_access ties the availability of these functions to framebuffers themselves, so no further checks are needed. */ - glNamedFramebufferDrawBuffers(id, color_bufs.size(), &color_bufs[0]); - glNamedFramebufferReadBuffer(id, first_buffer); + glNamedFramebufferDrawBuffers(obj_id, color_bufs.size(), &color_bufs[0]); + glNamedFramebufferReadBuffer(obj_id, first_buffer); } else { @@ -162,10 +181,13 @@ void OpenGLFramebuffer::update(unsigned mask) const glReadBuffer(first_buffer); } - if(ARB_direct_state_access) - status = glCheckNamedFramebufferStatus(id, GL_FRAMEBUFFER); - else - status = glCheckFramebufferStatus(GL_FRAMEBUFFER); + if(!resolve) + { + if(ARB_direct_state_access) + status = glCheckNamedFramebufferStatus(obj_id, GL_FRAMEBUFFER); + else + status = glCheckFramebufferStatus(GL_FRAMEBUFFER); + } } void OpenGLFramebuffer::require_complete() const @@ -182,7 +204,14 @@ void OpenGLFramebuffer::set_debug_name(const string &name) { #ifdef DEBUG if(KHR_debug) + { glObjectLabel(GL_FRAMEBUFFER, id, name.size(), name.c_str()); + if(resolve_id) + { + string resolve_name = name+" [resolve]"; + glObjectLabel(GL_FRAMEBUFFER, resolve_id, resolve_name.size(), resolve_name.c_str()); + } + } #else (void)name; #endif