From f74bf975131c21189ece7b8a495f887bf8de242f Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 8 May 2021 16:57:08 +0200 Subject: [PATCH] Update SGCT repository (closes #1437), VAO hygiene for RenderablePlane --- apps/OpenSpace/ext/sgct | 2 +- modules/base/rendering/renderableplane.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index 669fbc16a9..2a3ef78f72 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit 669fbc16a9910b28333427f5e07235baa43ea7a6 +Subproject commit 2a3ef78f721e919531bb05b0cedab2dabe2bb0be diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp index a029a4f576..40c9e57281 100644 --- a/modules/base/rendering/renderableplane.cpp +++ b/modules/base/rendering/renderableplane.cpp @@ -275,6 +275,7 @@ void RenderablePlane::render(const RenderData& data, RendererTasks&) { glBindVertexArray(_quad); glDrawArrays(GL_TRIANGLES, 0, 6); + glBindVertexArray(0); if (additiveBlending) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -327,6 +328,7 @@ void RenderablePlane::createPlane() { sizeof(GLfloat) * 6, reinterpret_cast(sizeof(GLfloat) * 4) ); + glBindVertexArray(0); } } // namespace openspace