Move the Resource function override of Texture classes into backend

[libs/gl.git] / source / core / framebuffer.cpp

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 167b403aec18e142548c9f02f775e453e71e6cb0..70c19859d128aeda40f1f9a1b34cb7cfd4774e06 100644 (file)
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -18,44 +18,30 @@ framebuffer_incomplete::framebuffer_incomplete(const std::string &reason):
 Framebuffer::Framebuffer(bool s):
        FramebufferBackend(s),
        dirty(0)
-{
-       if(s)
-       {
-               format = get_system_format();
-               get_system_size(width, height);
-       }
-}
+{ }
 
 Framebuffer::Framebuffer():
-       FramebufferBackend(false)
-{
-       init();
-}
+       FramebufferBackend(false),
+       width(0),
+       height(0),
+       dirty(0)
+{ }
 
 Framebuffer::Framebuffer(FrameAttachment fa):
-       FramebufferBackend(false)
+       Framebuffer()
 {
-       init();
        set_format(fa);
 }
 
 Framebuffer::Framebuffer(const FrameFormat &f):
-       FramebufferBackend(false)
+       Framebuffer()
 {
-       init();
        set_format(f);
 }
 
-void Framebuffer::init()
-{
-       width = 0;
-       height = 0;
-       dirty = 0;
-}
-
 void Framebuffer::set_format(const FrameFormat &fmt)
 {
-       if(!format.empty() || !id)
+       if(!format.empty())
                throw invalid_operation("Framebuffer::set_format");
        if(fmt.empty() || !is_format_supported(fmt))
                throw invalid_argument("Framebuffer::set_format");
@@ -115,7 +101,7 @@ void Framebuffer::check_size()
 
 void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned level, int layer, unsigned samples)
 {
-       if(format.empty() || !id)
+       if(format.empty() || attachments.empty())
                throw invalid_operation("Framebuffer::attach");
 
        if((format.get_samples()>1 && samples!=format.get_samples()) || (format.get_samples()==1 && samples))
@@ -171,7 +157,7 @@ void Framebuffer::attach_layered(FrameAttachment attch, TextureCube &tex, unsign
 
 void Framebuffer::detach(FrameAttachment attch)
 {
-       if(!id)
+       if(attachments.empty())
                throw invalid_operation("Framebuffer::detach");
 
        int i = format.index(attch);
@@ -183,20 +169,8 @@ void Framebuffer::detach(FrameAttachment attch)
        }
 }
 
-void Framebuffer::resize(const WindowView &view)
-{
-       if(id)
-               throw invalid_operation("Framebuffer::resize");
-
-       width = view.get_width();
-       height = view.get_height();
-}
-
 void Framebuffer::require_complete() const
 {
-       if(!id)
-               return;
-
        bool layered = (!attachments.empty() && attachments.front().layer<0);
        for(const Attachment &a: attachments)
        {
@@ -209,18 +183,6 @@ void Framebuffer::require_complete() const
        FramebufferBackend::require_complete();
 }
 
-Framebuffer &Framebuffer::system()
-{
-       static Framebuffer sys_framebuf(true);
-       return sys_framebuf;
-}
-
-
-Framebuffer::Attachment::Attachment():
-       tex(0),
-       level(0),
-       layer(0)
-{ }
 
 void Framebuffer::Attachment::set(Texture &t, unsigned l, int z)
 {