From b3e6bee913dcb94f14141e4b28e4fe9f17305929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 25 Jan 2023 22:58:06 +0100 Subject: [PATCH] Shaders: minor cleanup. --- src/Magnum/Shaders/Flat.frag | 8 ++++---- src/Magnum/Shaders/Test/FlatGLTest.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Shaders/Flat.frag b/src/Magnum/Shaders/Flat.frag index 46dc28ce5..68257f0f9 100644 --- a/src/Magnum/Shaders/Flat.frag +++ b/src/Magnum/Shaders/Flat.frag @@ -165,6 +165,10 @@ in lowp vec4 interpolatedVertexColor; flat in highp uint interpolatedInstanceObjectId; #endif +#ifdef MULTI_DRAW +flat in highp uint drawId; +#endif + /* Outputs */ #ifdef NEW_GLSL @@ -181,10 +185,6 @@ layout(location = OBJECT_ID_OUTPUT_ATTRIBUTE_LOCATION) out highp uint fragmentObjectId; #endif -#ifdef MULTI_DRAW -flat in highp uint drawId; -#endif - void main() { #ifdef UNIFORM_BUFFERS #ifdef OBJECT_ID diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index 983a24872..ef67dbdbe 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -544,7 +544,7 @@ const struct { {3*4, FlatGL2D::Weights{FlatGL2D::Weights::Components::Three}}, }}, false, true, false, "skinning.tga"}, - {"single set, upload joint matrices one by one", 5, 3, 0, 0, 0, {}, {InPlaceInit, { + {"single set, upload joint matrices one by one", 5, 3, 0, 0, 0, {}, {InPlaceInit, { {0, FlatGL2D::JointIds{FlatGL2D::JointIds::Components::Three}}, {3*4, FlatGL2D::Weights{FlatGL2D::Weights::Components::Three}}, }}, false, true, true,