Make the TextureCubeFace enum independent of OpenGL constants

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

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index e9d8863ca16e4e0379a11e9777def136cb596d2e..a60b437eff6fbe9e4c9a1eec8e2b6012b35395af 100644 (file)
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -131,9 +131,9 @@ void Framebuffer::update() const
        vector<GLenum> color_bufs;
        color_bufs.reserve(format.size());
        unsigned i = 0;
-       for(const uint16_t *j=format.begin(); j!=format.end(); ++j, ++i)
+       for(FrameAttachment a: format)
        {
-               GLenum gl_attach_point = get_gl_attachment(static_cast<FrameAttachment>(*j));
+               GLenum gl_attach_point = get_gl_attachment(a);
                if(dirty&(1<<i))
                {
                        const Attachment &attch = attachments[i];
@@ -156,7 +156,7 @@ void Framebuffer::update() const
                                else if(type==GL_TEXTURE_3D)
                                        glFramebufferTexture3D(GL_FRAMEBUFFER, gl_attach_point, type, attch.tex->get_id(), attch.level, attch.layer);
                                else if(type==GL_TEXTURE_CUBE_MAP)
-                                       glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, TextureCube::enumerate_faces(attch.layer), attch.tex->get_id(), attch.level);
+                                       glFramebufferTexture2D(GL_FRAMEBUFFER, gl_attach_point, get_gl_cube_face(static_cast<TextureCubeFace>(attch.layer)), attch.tex->get_id(), attch.level);
                        }
                        else if(ARB_direct_state_access)
                                glNamedFramebufferTexture(id, gl_attach_point, 0, 0);
@@ -166,6 +166,8 @@ void Framebuffer::update() const
 
                if(gl_attach_point!=GL_DEPTH_ATTACHMENT && gl_attach_point!=GL_STENCIL_ATTACHMENT)
                        color_bufs.push_back(gl_attach_point);
+
+               ++i;
        }
 
        if(color_bufs.size()>1)
@@ -254,21 +256,23 @@ void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned l
                throw incompatible_data("Framebuffer::attach");
 
        unsigned i = 0;
-       for(const uint16_t *j=format.begin(); j!=format.end(); ++j, ++i)
-               if(*j==attch)
+       for(FrameAttachment a: format)
+       {
+               if(a==attch)
                {
                        attachments[i].set(tex, level, layer);
                        dirty |= 1<<i;
                        check_size();
                        return;
                }
+               ++i;
+       }
 
        throw incompatible_data("Framebuffer::attach");
 }
 
 void Framebuffer::attach(FrameAttachment attch, Texture2D &tex, unsigned level)
 {
-       tex.allocate(level);
        set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, 0, 0);
 }
 
@@ -279,27 +283,23 @@ void Framebuffer::attach(FrameAttachment attch, Texture2DMultisample &tex)
 
 void Framebuffer::attach(FrameAttachment attch, Texture3D &tex, unsigned layer, unsigned level)
 {
-       tex.allocate(level);
        set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, layer, 0);
 }
 
 void Framebuffer::attach(FrameAttachment attch, TextureCube &tex, TextureCubeFace face, unsigned level)
 {
-       tex.allocate(level);
-       set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, TextureCube::get_face_index(face), 0);
+       set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, face, 0);
 }
 
 void Framebuffer::attach_layered(FrameAttachment attch, Texture3D &tex, unsigned level)
 {
        static Require _req(ARB_geometry_shader4);
-       tex.allocate(level);
        set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, -1, 0);
 }
 
 void Framebuffer::attach_layered(FrameAttachment attch, TextureCube &tex, unsigned level)
 {
        static Require _req(ARB_geometry_shader4);
-       tex.allocate(level);
        set_attachment(make_typed_attachment(attch, tex.get_format()), tex, level, -1, 0);
 }