From 658e8109a171fc060bb836f44772e16a9cdd59bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 2 Jun 2021 11:26:23 +0200 Subject: [PATCH] Shaders: fix grouping in Phong.vert. --- src/Magnum/Shaders/Phong.vert | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Magnum/Shaders/Phong.vert b/src/Magnum/Shaders/Phong.vert index 97f5920ba..318a28480 100644 --- a/src/Magnum/Shaders/Phong.vert +++ b/src/Magnum/Shaders/Phong.vert @@ -224,8 +224,6 @@ in mediump vec3 bitangent; layout(location = TEXTURECOORDINATES_ATTRIBUTE_LOCATION) #endif in mediump vec2 textureCoordinates; - -out mediump vec2 interpolatedTextureCoordinates; #endif #ifdef VERTEX_COLOR @@ -233,8 +231,6 @@ out mediump vec2 interpolatedTextureCoordinates; layout(location = COLOR_ATTRIBUTE_LOCATION) #endif in lowp vec4 vertexColor; - -out lowp vec4 interpolatedVertexColor; #endif #ifdef INSTANCED_OBJECT_ID @@ -242,8 +238,6 @@ out lowp vec4 interpolatedVertexColor; layout(location = OBJECT_ID_ATTRIBUTE_LOCATION) #endif in highp uint instanceObjectId; - -flat out highp uint interpolatedInstanceObjectId; #endif #ifdef INSTANCED_TRANSFORMATION @@ -267,6 +261,18 @@ in mediump vec2 instancedTextureOffset; /* Outputs */ +#ifdef TEXTURED +out mediump vec2 interpolatedTextureCoordinates; +#endif + +#ifdef VERTEX_COLOR +out lowp vec4 interpolatedVertexColor; +#endif + +#ifdef INSTANCED_OBJECT_ID +flat out highp uint interpolatedInstanceObjectId; +#endif + #if LIGHT_COUNT out mediump vec3 transformedNormal; #ifdef NORMAL_TEXTURE