1 files changed, 9 insertions, 7 deletions
diff --git a/src/extras/shaders/rhi/light.inc.frag b/src/extras/shaders/rhi/light.inc.frag
index 861e1ba4a..8079ae8a3 100644
--- a/src/extras/shaders/rhi/light.inc.frag
+++ b/src/extras/shaders/rhi/light.inc.frag
@@ -1,24 +1,26 @@
+#pragma include defaultuniforms.inc
+
 const int MAX_LIGHTS = 8;
 const int TYPE_POINT = 0;
 const int TYPE_DIRECTIONAL = 1;
 const int TYPE_SPOT = 2;
+
 struct Light {
-    int type;
     vec3 position;
-    vec3 color;
     float intensity;
-    vec3 direction;
+    vec3 color;
     float constantAttenuation;
+    vec3 direction;
     float linearAttenuation;
     float quadraticAttenuation;
     float cutOffAngle;
+    int type;
 };
 
-
 layout(std140, binding = auto) uniform qt3d_light_uniforms {
-  uniform Light lights[MAX_LIGHTS];
-  uniform int lightCount;
-  uniform int envLightCount;
+  Light lights[MAX_LIGHTS];
+  int lightCount;
+  int envLightCount;
 };
 
 // Pre-convolved environment maps