Merge remote-tracking branch 'origin/5.11' into 5.12

* origin/5.11:

  aa8e21c Add new Qt3D demo
  ca03367 Exclude demos from colibri imx6ull
  a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
  d7e9731 do not enable highdpiscaling on emulator
  f730907 Fix mediaplayer default video path
  09aa32d Fix some major scaling & font issues on ebike-demo

Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb

1 files changed, 25 insertions, 0 deletions

diff --git a/basicsuite/advancedcustommaterial/shaders/gl3/light.inc.frag b/basicsuite/advancedcustommaterial/shaders/gl3/light.inc.frag
new file mode 100644
index 0000000..0b64263
--- /dev/null
+++ b/basicsuite/advancedcustommaterial/shaders/gl3/light.inc.frag
@@ -0,0 +1,25 @@
+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;
+    float constantAttenuation;
+    float linearAttenuation;
+    float quadraticAttenuation;
+    float cutOffAngle;
+};
+uniform Light lights[MAX_LIGHTS];
+uniform int lightCount;
+
+// Pre-convolved environment maps
+struct EnvironmentLight {
+    samplerCube irradiance; // For diffuse contribution
+    samplerCube specular; // For specular contribution
+};
+uniform EnvironmentLight envLight;
+uniform int envLightCount = 0;