X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fframebuffer.cpp;h=6877f4808b7402c7f1660097c3860bb7fcbbe5bc;hb=c83a3894a5b52499916507e77c0b79436ebad848;hp=ea28d5db2d261eeb999d1e6c05eea38b6aefe70a;hpb=6fa59eb26c39443eb44feecd17b7a8ea45411730;p=libs%2Fgl.git diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp index ea28d5db..6877f480 100644 --- a/source/framebuffer.cpp +++ b/source/framebuffer.cpp @@ -1,11 +1,6 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - +#include "error.h" #include "extension.h" +#include "ext_framebuffer_blit.h" #include "ext_framebuffer_object.h" #include "framebuffer.h" #include "misc.h" @@ -22,7 +17,7 @@ Framebuffer::Framebuffer(unsigned i): dirty(0) { if(id) - throw InvalidParameterValue("System framebuffer must have id 0"); + throw invalid_argument("System framebuffer must have id 0"); int viewport[4]; glGetIntegerv(GL_VIEWPORT, viewport); @@ -104,7 +99,7 @@ void Framebuffer::check_size() void Framebuffer::attach(FramebufferAttachment attch, Renderbuffer &rbuf) { if(!id) - throw InvalidState("Can't attach to system framebuffer"); + throw invalid_operation("Framebuffer::attach"); unsigned i = get_attachment_index(attch); attachments[i].set(rbuf); @@ -115,7 +110,7 @@ void Framebuffer::attach(FramebufferAttachment attch, Renderbuffer &rbuf) void Framebuffer::attach(FramebufferAttachment attch, Texture2D &tex, unsigned level) { if(!id) - throw InvalidState("Can't attach to system framebuffer"); + throw invalid_operation("Framebuffer::attach"); unsigned i = get_attachment_index(attch); attachments[i].set(tex, level); @@ -126,7 +121,7 @@ void Framebuffer::attach(FramebufferAttachment attch, Texture2D &tex, unsigned l void Framebuffer::detach(FramebufferAttachment attch) { if(!id) - throw InvalidState("Can't detach from system framebuffer"); + throw invalid_operation("Framebuffer::detach"); unsigned i = get_attachment_index(attch); attachments[i].clear(); @@ -146,6 +141,39 @@ void Framebuffer::clear(BufferBits bits) glClear(bits); } +void Framebuffer::blit_from(const Framebuffer &other, int sx0, int sy0, int sx1, int sy1, int dx0, int dy0, int dx1, int dy1, BufferBits bits, bool filter) +{ + static RequireExtension _ext("GL_EXT_framebuffer_blit"); + + const Framebuffer *old = current(); + if(set_current(this)) + { + glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, id); + if(dirty) + { + update_attachment(dirty); + dirty = 0; + } + } + if(old!=&other) + glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, other.id); + + glBlitFramebufferEXT(sx0, sy0, sx1, sy1, dx0, dy0, dx1, dy1, bits, (filter ? GL_LINEAR : GL_NEAREST)); + + set_current(old); + glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, (old ? old->id : 0)); +} + +void Framebuffer::blit_from(const Framebuffer &other, int sx, int sy, unsigned wd, unsigned ht, int dx, int dy, BufferBits bits) +{ + blit_from(other, sx, sy, sx+wd, sy+ht, dx, dy, dx+wd, dy+ht, bits, false); +} + +void Framebuffer::blit_from(const Framebuffer &other, BufferBits bits, bool filter) +{ + blit_from(other, 0, 0, other.width, other.height, 0, 0, width, height, bits, filter); +} + void Framebuffer::bind() const { if(set_current(this))