From f574850621453252a9dbd2be1caf765c06b629de Mon Sep 17 00:00:00 2001 From: lisyarus Date: Thu, 30 Jun 2022 23:08:13 +0300 Subject: [PATCH] Fix setting up instanced VAO attribs using gfx::setup --- libs/gfx/include/psemek/gfx/attribs.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/gfx/include/psemek/gfx/attribs.hpp b/libs/gfx/include/psemek/gfx/attribs.hpp index a458882e..8ae48a37 100644 --- a/libs/gfx/include/psemek/gfx/attribs.hpp +++ b/libs/gfx/include/psemek/gfx/attribs.hpp @@ -430,10 +430,11 @@ namespace psemek::gfx return result; } - inline void setup(attribs_description const & attribs) + inline void setup(attribs_description const & attribs, bool instance) { for (auto const & a : attribs.attribs) { + if (instance != (a.divisor != 0)) continue; gl::EnableVertexAttribArray(a.index); gl::VertexAttribDivisor(a.index, a.divisor); GLuint stride = (a.divisor == 0) ? attribs.vertex_size : attribs.instance_size;