X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fframebuffer.cpp;h=cf478ce29b686d842ce2074078952633b2e47b02;hp=8c618ce51b7112ba96f4332cb1e08de683744397;hb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;hpb=357acfb941a8b5b4a6fb36e2134707d46e028d88 diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp index 8c618ce5..cf478ce2 100644 --- a/source/framebuffer.cpp +++ b/source/framebuffer.cpp @@ -1,11 +1,16 @@ #include +#include #include #include +#include +#include +#include #include "error.h" #include "framebuffer.h" #include "misc.h" #include "renderbuffer.h" #include "texture2d.h" +#include "texture3d.h" using namespace std; @@ -34,6 +39,15 @@ void operator<<(LexicalConverter &conv, FramebufferStatus status) case FRAMEBUFFER_INCOMPLETE_READ_BUFFER: conv.result("missing read buffer attachment"); break; + case FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: + conv.result("mismatched attachment sample counts"); + break; + case FRAMEBUFFER_INCOMPLETE_LAYER_COUNT: + conv.result("mismatched attachment layer counts"); + break; + case FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS: + conv.result("mismatched attachment layering"); + break; case FRAMEBUFFER_UNSUPPORTED: conv.result("unsupported"); break; @@ -67,7 +81,10 @@ Framebuffer::Framebuffer(): { static Require _req(EXT_framebuffer_object); - glGenFramebuffers(1, &id); + if(ARB_direct_state_access) + glCreateFramebuffers(1, &id); + else + glGenFramebuffers(1, &id); } Framebuffer::~Framebuffer() @@ -80,54 +97,83 @@ Framebuffer::~Framebuffer() void Framebuffer::update_attachment(unsigned mask) const { - if(current()==this) + if(!ARB_direct_state_access && current()!=this) + { + dirty |= mask; + return; + } + + std::vector color_bufs; + color_bufs.reserve(attachments.size()); + for(unsigned i=0; i color_bufs; - color_bufs.reserve(attachments.size()); - for(unsigned i=0; iget_id()); + else glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, GL_RENDERBUFFER, attch.rbuf->get_id()); - else if(attch.type==GL_TEXTURE_2D) - { - static_cast(attch.tex)->allocate(attch.level); + } + else if(attch.type==GL_TEXTURE_2D) + { + static_cast(attch.tex)->allocate(attch.level); + if(ARB_direct_state_access) + glNamedFramebufferTexture(id, attch.attachment, attch.tex->get_id(), attch.level); + else glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.type, attch.tex->get_id(), attch.level); - } - else if(attch.type==GL_TEXTURE_CUBE_MAP) - { - static_cast(attch.tex)->allocate(attch.level); - glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, attch.cube_face, attch.tex->get_id(), attch.level); - } + } + else if(attch.type==GL_TEXTURE_3D || attch.type==GL_TEXTURE_2D_ARRAY) + { + static_cast(attch.tex)->allocate(attch.level); + if(ARB_direct_state_access) + glNamedFramebufferTextureLayer(id, attch.attachment, attch.tex->get_id(), attch.level, attch.layer); + else if(attch.type==GL_TEXTURE_2D_ARRAY) + glFramebufferTextureLayer(GL_FRAMEBUFFER, attch.attachment, attch.tex->get_id(), attch.level, attch.layer); else - glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, 0, 0); + glFramebufferTexture3D(GL_FRAMEBUFFER, attch.attachment, attch.type, attch.tex->get_id(), attch.level, attch.layer); } - - if(attch.attachment>=COLOR_ATTACHMENT0 && attch.attachment<=COLOR_ATTACHMENT3) - color_bufs.push_back(attch.attachment); + else if(attch.type==GL_TEXTURE_CUBE_MAP) + { + static_cast(attch.tex)->allocate(attch.level); + if(ARB_direct_state_access) + glNamedFramebufferTextureLayer(id, attch.attachment, attch.tex->get_id(), attch.level, attch.layer); + else + glFramebufferTexture2D(GL_FRAMEBUFFER, attch.attachment, TextureCube::enumerate_faces(attch.layer), attch.tex->get_id(), attch.level); + } + else if(ARB_direct_state_access) + glNamedFramebufferRenderbuffer(id, attch.attachment, 0, 0); + else + glFramebufferRenderbuffer(GL_FRAMEBUFFER, attch.attachment, 0, 0); } - if(color_bufs.empty()) - { - glDrawBuffer(GL_NONE); - glReadBuffer(GL_NONE); - } - else if(color_bufs.size()==1) - { - glDrawBuffer(color_bufs.front()); - glReadBuffer(color_bufs.front()); - } - else - { - static Require _req(ARB_draw_buffers); - glDrawBuffers(color_bufs.size(), &color_bufs[0]); - glReadBuffer(color_bufs.front()); - } + if(attch.attachment>=COLOR_ATTACHMENT0 && attch.attachment<=COLOR_ATTACHMENT3) + color_bufs.push_back(attch.attachment); + } + + if(color_bufs.size()>1) + static Require _req(ARB_draw_buffers); + + GLenum first_buffer = (color_bufs.empty() ? GL_NONE : color_bufs.front()); + if(ARB_direct_state_access) + { + /* 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); } else - dirty |= mask; + { + if(ARB_draw_buffers) + glDrawBuffers(color_bufs.size(), &color_bufs[0]); + else if(MSP_buffer_control) + glDrawBuffer(first_buffer); + + if(MSP_buffer_control) + glReadBuffer(first_buffer); + } } void Framebuffer::check_size() @@ -144,12 +190,18 @@ void Framebuffer::check_size() else if(i->type==GL_TEXTURE_2D) { Texture2D *tex = static_cast(i->tex); - width = tex->get_width(); - height = tex->get_height(); + width = max(tex->get_width()>>i->level, 1U); + height = max(tex->get_height()>>i->level, 1U); + } + else if(i->type==GL_TEXTURE_3D || i->type==GL_TEXTURE_2D_ARRAY) + { + Texture3D *tex = static_cast(i->tex); + width = max(tex->get_width()>>i->level, 1U); + height = max(tex->get_height()>>i->level, 1U); } else if(i->type==GL_TEXTURE_CUBE_MAP) { - width = static_cast(i->tex)->get_size(); + width = max(static_cast(i->tex)->get_size()>>i->level, 1U); height = width; } if(full_viewport) @@ -184,7 +236,18 @@ void Framebuffer::attach(FramebufferAttachment attch, Texture2D &tex, unsigned l throw invalid_operation("Framebuffer::attach"); unsigned i = get_attachment_index(attch); - attachments[i].set(tex, 0, level); + attachments[i].set(tex, level, 0); + update_attachment(1<(glCheckFramebufferStatus(GL_FRAMEBUFFER)); + if(ARB_direct_state_access) + return static_cast(glCheckNamedFramebufferStatus(id, GL_FRAMEBUFFER)); + else + { + BindRestore _bind(this); + return static_cast(glCheckFramebufferStatus(GL_FRAMEBUFFER)); + } } void Framebuffer::require_complete() const @@ -250,6 +318,12 @@ void Framebuffer::blit_from(const Framebuffer &other, int sx0, int sy0, int sx1, { static Require _req(EXT_framebuffer_blit); + if(ARB_direct_state_access) + { + glBlitNamedFramebuffer(other.id, id, sx0, sy0, sx1, sy1, dx0, dy0, dx1, dy1, bits, (filter ? GL_LINEAR : GL_NEAREST)); + return; + } + const Framebuffer *old = current(); if(set_current(this)) { @@ -317,7 +391,8 @@ Framebuffer &Framebuffer::system() Framebuffer::Attachment::Attachment(FramebufferAttachment a): attachment(a), type(0), - level(0) + level(0), + layer(0) { } void Framebuffer::Attachment::set(Renderbuffer &r) @@ -325,14 +400,15 @@ void Framebuffer::Attachment::set(Renderbuffer &r) type = GL_RENDERBUFFER; rbuf = &r; level = 0; + layer = 0; } -void Framebuffer::Attachment::set(Texture &t, GLenum f, unsigned l) +void Framebuffer::Attachment::set(Texture &t, unsigned l, unsigned z) { type = t.get_target(); tex = &t; - cube_face = f; level = l; + layer = z; } void Framebuffer::Attachment::clear()