From 20c66274b4529a6e84b36acea3f2195edad6b3db Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Mon, 3 May 2021 17:05:17 +0200
Subject: [PATCH] Downgrade SimpleFramebuffer to OpenGL core profile 4.1, as
well.
This was forgotten in commit be56de46cd95249eaeadd3e59e1ac529ce6cc4f0
---
.../trackviewer/render/SimpleFramebuffer.hpp | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/cpp/include/robofish/trackviewer/render/SimpleFramebuffer.hpp b/cpp/include/robofish/trackviewer/render/SimpleFramebuffer.hpp
index e012baa..a3afa60 100644
--- a/cpp/include/robofish/trackviewer/render/SimpleFramebuffer.hpp
+++ b/cpp/include/robofish/trackviewer/render/SimpleFramebuffer.hpp
@@ -21,22 +21,28 @@ namespace robofish::trackviewer
: Framebuffer()
{
if (samples > 1) {
- glNamedRenderbufferStorageMultisample(renderbuffers_m[0], samples, GL_RGBA8, width, height);
- glNamedRenderbufferStorageMultisample(renderbuffers_m[1], samples, GL_DEPTH_COMPONENT16, width, height);
+ glBindRenderbuffer(GL_RENDERBUFFER, renderbuffers_m[0]);
+ glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, GL_RGBA8, width, height);
+ glBindRenderbuffer(GL_RENDERBUFFER, renderbuffers_m[1]);
+ glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, GL_DEPTH_COMPONENT16, width, height);
} else {
- glNamedRenderbufferStorage(renderbuffers_m[0], GL_RGBA8, width, height);
- glNamedRenderbufferStorage(renderbuffers_m[1], GL_DEPTH_COMPONENT16, width, height);
+ glBindRenderbuffer(GL_RENDERBUFFER, renderbuffers_m[0]);
+ glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, width, height);
+ glBindRenderbuffer(GL_RENDERBUFFER, renderbuffers_m[1]);
+ glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
}
- glNamedFramebufferRenderbuffer(*this, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderbuffers_m[0]);
- glNamedFramebufferRenderbuffer(*this, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, renderbuffers_m[1]);
+ glBindFramebuffer(GL_FRAMEBUFFER, *this);
+
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderbuffers_m[0]);
+ glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, renderbuffers_m[1]);
- if (glCheckNamedFramebufferStatus(*this, GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
+ if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) {
throw std::runtime_error("OpenGL Error: Failed to setup framebuffer, try requesting "
"fewer samples");
}
- glNamedFramebufferDrawBuffer(*this, GL_COLOR_ATTACHMENT0);
+ glDrawBuffer(GL_COLOR_ATTACHMENT0);
}
void bind()
--
GitLab