From 6885f0647b1ff18d0790f7293aea91e417f3813a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 3 Aug 2018 11:58:37 +0200 Subject: [PATCH] Shaders: minor code reordering. --- src/Magnum/Shaders/Phong.frag | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Magnum/Shaders/Phong.frag b/src/Magnum/Shaders/Phong.frag index 1c8e0628b..f74e5b9a6 100644 --- a/src/Magnum/Shaders/Phong.frag +++ b/src/Magnum/Shaders/Phong.frag @@ -33,24 +33,6 @@ #define const #endif -#ifdef EXPLICIT_UNIFORM_LOCATION -layout(location = 7) -#endif -uniform lowp vec4 lightColor - #ifndef GL_ES - = vec4(1.0) - #endif - ; - -#ifdef EXPLICIT_UNIFORM_LOCATION -layout(location = 8) -#endif -uniform mediump float shininess - #ifndef GL_ES - = 80.0 - #endif - ; - #ifdef AMBIENT_TEXTURE #ifdef EXPLICIT_TEXTURE_LAYER layout(binding = 0) @@ -103,6 +85,24 @@ uniform lowp vec4 specularColor #endif ; +#ifdef EXPLICIT_UNIFORM_LOCATION +layout(location = 7) +#endif +uniform lowp vec4 lightColor + #ifndef GL_ES + = vec4(1.0) + #endif + ; + +#ifdef EXPLICIT_UNIFORM_LOCATION +layout(location = 8) +#endif +uniform mediump float shininess + #ifndef GL_ES + = 80.0 + #endif + ; + in mediump vec3 transformedNormal; in highp vec3 lightDirection; in highp vec3 cameraDirection;