Change various generated texture names to use the unified extension

[libs/gl.git] / source / render / rendertarget.cpp

diff --git a/source/render/rendertarget.cpp b/source/render/rendertarget.cpp
index 302b983f478ecd34a1d67ebc92fd3ecec33f7d43..00176710c4a796047e02c462e899fde26d0c8ffd 100644 (file)
--- a/source/render/rendertarget.cpp
+++ b/source/render/rendertarget.cpp
@@ -17,23 +17,22 @@ RenderTarget::RenderTarget(unsigned w, unsigned h, const FrameFormat &f):
 {
        textures.reserve(f.size());
        unsigned samples = f.get_samples();
-       for(const uint16_t *i=f.begin(); i!=f.end(); ++i)
+       for(FrameAttachment a: f)
        {
-               FrameAttachment fa = static_cast<FrameAttachment>(*i);
-               PixelFormat pf = get_attachment_pixelformat(*i);
+               PixelFormat pf = get_attachment_pixelformat(a);
 
                if(samples>1)
                {
                        Texture2DMultisample *tex2d_ms = new Texture2DMultisample;
                        tex2d_ms->storage(pf, width, height, samples);
-                       fbo.attach(fa, *tex2d_ms);
+                       fbo.attach(a, *tex2d_ms);
                        textures.push_back(tex2d_ms);
                }
                else
                {
                        Texture2D *tex2d = new Texture2D;
                        tex2d->storage(pf, width, height, 1);
-                       fbo.attach(fa, *tex2d);
+                       fbo.attach(a, *tex2d);
                        textures.push_back(tex2d);
                }
        }
@@ -68,11 +67,10 @@ void RenderTarget::set_debug_name(const string &name)
 {
 #ifdef DEBUG
        fbo.set_debug_name(name+" [FBO]");
-       const FrameFormat &fmt = fbo.get_format();
        unsigned i = 0;
-       for(const uint16_t *j=fmt.begin(); j!=fmt.end(); ++i, ++j)
+       for(FrameAttachment a: fbo.get_format())
        {
-               unsigned attach_pt = get_attach_point(static_cast<FrameAttachment>(*j));
+               unsigned attach_pt = get_attach_point(a);
 
                string tex_name;
                if(attach_pt==get_attach_point(DEPTH_ATTACHMENT))
@@ -82,7 +80,7 @@ void RenderTarget::set_debug_name(const string &name)
                else
                        tex_name = Msp::format("%s/color%d", name, attach_pt);
 
-               textures[i]->set_debug_name(tex_name+".tex2d");
+               textures[i++]->set_debug_name(tex_name+".tex");
        }
 #else
        (void)name;