From 0bc2769984443dc5c25d0ee27ce6f216b08ba45d Mon Sep 17 00:00:00 2001 From: jmacey Date: Tue, 12 Dec 2023 20:38:34 +0000 Subject: [PATCH 1/2] found bug in SimpleIndexVAO where the index buffer was not deleted before new buffer added --- src/SimpleIndexVAO.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SimpleIndexVAO.cpp b/src/SimpleIndexVAO.cpp index 35083951..a9e400ea 100644 --- a/src/SimpleIndexVAO.cpp +++ b/src/SimpleIndexVAO.cpp @@ -45,6 +45,8 @@ void SimpleIndexVAO::setData(const AbstractVAO::VertexData &_data) if(m_allocated) { glDeleteBuffers(1, &m_buffer); + glDeleteBuffers(1, &m_idxBuffer); + } glGenBuffers(1, &m_buffer); From b2fc242718dd2798ae85e99053b76a2b1ac48cc0 Mon Sep 17 00:00:00 2001 From: jmacey Date: Wed, 13 Dec 2023 12:45:12 +0000 Subject: [PATCH 2/2] updated Vec2 to match otehrs --- include/ngl/Vec2.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/ngl/Vec2.h b/include/ngl/Vec2.h index 04716170..29e4cd5c 100644 --- a/include/ngl/Vec2.h +++ b/include/ngl/Vec2.h @@ -242,10 +242,9 @@ class NGL_DLLEXPORT Vec2 /// anonymous unions public whereas clang++ complains see this post /// http://jonmacey.blogspot.com/2011/03/anonymous-union-struct-weirdness.html public: -#pragma pack(push, 1) - #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wpedantic" +#pragma pack(push, 1) union { struct