X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fframebuffer.cpp;h=851b6431b2fb134d470b1116262411af471532be;hb=a4d83d3748cdde8cf30683d36a040d3dfacfd693;hp=0ce00becd23d5503ca5f26fec5f13eab065f9f17;hpb=e9a898f315b5d1396f196d785913a283c30940f2;p=libs%2Fgl.git

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 0ce00bec..851b6431 100644
--- 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 *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];
@@ -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,14 +256,17 @@ void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned l
 		throw incompatible_data("Framebuffer::attach");
 
 	unsigned i = 0;
-	for(const UInt16 *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");
 }