From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 9 Nov 2021 23:43:06 +0000 (+0200)
Subject: Check for empty attachments array instead of zero id in Framebuffer
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4080571d24c1734a9188ee7fac38cf3180325adf;p=libs%2Fgl.git

Check for empty attachments array instead of zero id in Framebuffer

The id is an OpenGL implementation detail and shouldn't be used in the
common part.
---

diff --git a/source/core/framebuffer.cpp b/source/core/framebuffer.cpp
index cc8dec4f..01fd6265 100644
--- a/source/core/framebuffer.cpp
+++ b/source/core/framebuffer.cpp
@@ -47,7 +47,7 @@ Framebuffer::Framebuffer(const FrameFormat &f):
 
 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");
@@ -107,7 +107,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))
@@ -163,7 +163,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);
@@ -177,7 +177,7 @@ void Framebuffer::detach(FrameAttachment attch)
 
 void Framebuffer::resize(const WindowView &view)
 {
-	if(id)
+	if(attachments.empty())
 		throw invalid_operation("Framebuffer::resize");
 
 	width = view.get_width();
@@ -186,9 +186,6 @@ void Framebuffer::resize(const WindowView &view)
 
 void Framebuffer::require_complete() const
 {
-	if(!id)
-		return;
-
 	bool layered = (!attachments.empty() && attachments.front().layer<0);
 	for(const Attachment &a: attachments)
 	{