From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 13 Sep 2021 17:01:53 +0000 (+0300)
Subject: Consider all attachments when determining Framebuffer's size
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2e1a887ef0d4a0af8b8aa781619cff6d75692e14;p=libs%2Fgl.git

Consider all attachments when determining Framebuffer's size
---

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index 05cd27f0..6e7d9dc9 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -200,36 +200,49 @@ void Framebuffer::update() const
 
 void Framebuffer::check_size()
 {
+	bool first = true;
 	for(vector<Attachment>::iterator i=attachments.begin(); i!=attachments.end(); ++i)
 		if(i->tex)
 		{
 			GLenum type = i->tex->get_target();
+			unsigned w = 0;
+			unsigned h = 0;
 			if(type==GL_TEXTURE_2D)
 			{
 				Texture2D *tex = static_cast<Texture2D *>(i->tex);
-				width = max(tex->get_width()>>i->level, 1U);
-				height = max(tex->get_height()>>i->level, 1U);
+				w = max(tex->get_width()>>i->level, 1U);
+				h = max(tex->get_height()>>i->level, 1U);
 			}
 			else if(type==GL_TEXTURE_2D_MULTISAMPLE)
 			{
 				Texture2DMultisample *tex = static_cast<Texture2DMultisample *>(i->tex);
-				width = tex->get_width();
-				height = tex->get_height();
+				w = tex->get_width();
+				h = tex->get_height();
 			}
 			else if(type==GL_TEXTURE_3D || type==GL_TEXTURE_2D_ARRAY)
 			{
 				Texture3D *tex = static_cast<Texture3D *>(i->tex);
-				width = max(tex->get_width()>>i->level, 1U);
-				height = max(tex->get_height()>>i->level, 1U);
+				w = max(tex->get_width()>>i->level, 1U);
+				h = max(tex->get_height()>>i->level, 1U);
 			}
 			else if(type==GL_TEXTURE_CUBE_MAP)
 			{
-				width = max(static_cast<TextureCube *>(i->tex)->get_size()>>i->level, 1U);
-				height = width;
+				w = max(static_cast<TextureCube *>(i->tex)->get_size()>>i->level, 1U);
+				h = w;
 			}
-			break;
-		}
 
+			if(first)
+			{
+				width = w;
+				height = h;
+				first = false;
+			}
+			else
+			{
+				width = min(width, w);
+				height = min(height, h);
+			}
+		}
 }
 
 void Framebuffer::set_attachment(FrameAttachment attch, Texture &tex, unsigned level, int layer, unsigned samples)