Use an header included in every shaders.

data/shaders/billboard.vert

@@ -1,5 +1,4 @@
 uniform mat4 ModelViewMatrix;
-uniform mat4 ProjectionMatrix;
 uniform vec3 Position;
 uniform vec2 Size;
 

data/shaders/bloomblend.frag

@@ -2,16 +2,6 @@ uniform sampler2D tex_128;
 uniform sampler2D tex_256;
 uniform sampler2D tex_512;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 out vec4 FragColor;
 
 void main()

data/shaders/diffuseenvmap.frag

@@ -3,15 +3,6 @@ uniform float greenLmn[9];
 uniform float redLmn[9];
 uniform sampler2D ntex;
 uniform mat4 TransposeViewMatrix;
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
 
 out vec4 Diff;
 

data/shaders/displace.frag

@@ -5,16 +5,6 @@ uniform sampler2D tex;
 uniform vec2 dir;
 uniform vec2 dir2;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 #if __VERSION__ >= 130
 in vec2 uv;
 in vec2 uv_bis;

data/shaders/displace.vert

@@ -1,20 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 uniform mat4 ModelMatrix;
 
 #if __VERSION__ >= 330

data/shaders/dof.frag

@@ -1,16 +1,6 @@
 uniform sampler2D tex;
 uniform sampler2D dtex;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 out vec4 FragColor;
 
 float focalDepth = 10.;

data/shaders/flipparticle.vert

@@ -1,13 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 in vec2 quadcorner;
 in vec2 texcoord;
 in vec3 position;

data/shaders/fog.frag

@@ -7,24 +7,6 @@ uniform float start;
 uniform float end;
 uniform vec3 col;
 
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 out vec4 FragColor;
 
 

data/shaders/frustrum.vert

@@ -1,13 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 uniform int idx;
 
 in vec3 Position;

data/shaders/gi.frag

@@ -14,16 +14,6 @@ uniform vec3 extents;
 uniform mat4 RHMatrix;
 uniform mat4 InvRHMatrix;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 vec4 SHBasis (const in vec3 dir)
 { 
     float   L00  = 0.282095;

data/shaders/grass_pass.vert

@@ -1,20 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 uniform vec3 windDir;
 uniform mat4 ModelMatrix;
 uniform mat4 InverseModelMatrix;

data/shaders/grass_pass2.frag

@@ -1,21 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 uniform sampler2D Albedo;
 uniform vec3 SunDir;
 uniform sampler2D dtex;

data/shaders/header.txt

@@ -0,0 +1,16 @@
+#ifdef UBO_DISABLED
+uniform mat4 ViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 InverseViewMatrix;
+uniform mat4 InverseProjectionMatrix;
+#else
+layout (std140) uniform MatrixesData
+{
+    mat4 ViewMatrix;
+    mat4 ProjectionMatrix;
+    mat4 InverseViewMatrix;
+    mat4 InverseProjectionMatrix;
+    mat4 ShadowViewProjMatrixes[4];
+    vec2 screen;
+};
+#endif

data/shaders/instanced_grass.vert

@@ -1,13 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 uniform vec3 windDir;
 
 #if __VERSION__ >= 330

data/shaders/instanced_object_pass.vert

@@ -1,20 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 #if __VERSION__ >= 330
 layout(location = 0) in vec3 Position;
 layout(location = 1) in vec3 Normal;

data/shaders/instanciedgrassshadow.vert

@@ -1,11 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-};
 uniform vec3 windDir;
 #if __VERSION__ >= 330
 layout(location = 0) in vec3 Position;

data/shaders/instanciedshadow.vert

@@ -1,12 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-};
-
 #if __VERSION__ >= 330
 layout(location = 0) in vec3 Position;
 layout(location = 3) in vec2 Texcoord;

data/shaders/linearizedepth.frag

@@ -2,16 +2,6 @@ uniform sampler2D tex;
 uniform float zn;
 uniform float zf;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 out float Depth;
 
 void main()

data/shaders/mlaa_blend2.frag

@@ -1,16 +1,6 @@
 uniform sampler2D edgesMap;
 uniform sampler2D areaMap;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 #define MAX_SEARCH_STEPS 8.0
 #define MAX_DISTANCE 33.0
 

data/shaders/mlaa_offset.vert

@@ -1,13 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 in vec2 Position;
 in vec2 Texcoord;
 

data/shaders/motion_blur.frag

@@ -37,16 +37,6 @@ uniform float mask_radius;
 
 uniform mat4 previous_viewproj;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 out vec4 FragColor;
 
 // Number of samples used for blurring

data/shaders/normalmap.vert

@@ -1,12 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-};
-
 uniform mat4 ModelMatrix;
 uniform mat4 InverseModelMatrix;
 

data/shaders/object_pass.vert

@@ -1,20 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 uniform mat4 ModelMatrix;
 uniform mat4 InverseModelMatrix;
 

data/shaders/objectpass_spheremap.frag

@@ -1,23 +1,5 @@
 // See http://www.ozone3d.net/tutorials/glsl_texturing_p04.php for ref
 
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 uniform sampler2D tex;
 
 #if __VERSION__ >= 130

data/shaders/particle.frag

@@ -2,16 +2,6 @@ uniform sampler2D tex;
 uniform sampler2D dtex;
 uniform mat4 invproj;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 in float lf;
 in vec2 tc;
 in vec3 pc;

data/shaders/particle.vert

@@ -1,12 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
 uniform vec3 color_from;
 uniform vec3 color_to;
 

data/shaders/pointlight.frag

@@ -2,24 +2,6 @@ uniform sampler2D ntex;
 uniform sampler2D dtex;
 uniform float spec;
 
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 flat in vec3 center;
 flat in float energy;
 flat in vec3 col;

data/shaders/pointlight.vert

@@ -1,20 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 in vec3 Position;
 in float Energy;
 in vec3 Color;

data/shaders/rhdebug.vert

@@ -1,15 +1,5 @@
 uniform vec3 extents;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 uniform mat4 RHMatrix;
 
 ivec3 resolution = ivec3(32, 16, 32);

data/shaders/shadow.vert

@@ -1,12 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-};
-
 uniform mat4 ModelMatrix;
 
 #if __VERSION__ >= 330

data/shaders/shadow_grass.vert

@@ -1,12 +1,3 @@
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-};
-
 uniform mat4 ModelMatrix;
 uniform vec3 windDir;
 

data/shaders/sky.frag

@@ -1,21 +1,3 @@
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 uniform samplerCube tex;
 
 #if __VERSION__ >= 130

data/shaders/splatting.frag

@@ -8,16 +8,6 @@ uniform sampler2D SpecularMap;
 uniform sampler2D SSAO;
 uniform vec3 ambient;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 #if __VERSION__ >= 130
 in vec2 uv;
 in vec2 uv_bis;

data/shaders/ssao.frag

@@ -3,25 +3,6 @@
 
 uniform sampler2D dtex;
 uniform vec4 samplePoints[16];
-
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 out float AO;
 
 const float sigma = 1.;

data/shaders/sunlight.frag

@@ -8,24 +8,6 @@ uniform mat4 invproj;
 //uniform int hasclouds;
 //uniform vec2 wind;
 
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 out vec4 Diff;
 out vec4 Spec;
 

data/shaders/sunlightshadow.frag

@@ -10,25 +10,6 @@ uniform vec3 col;
 //uniform vec2 wind;
 //uniform float shadowoffset;
 
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform mat4 ShadowViewProjMatrixes[4];
-uniform vec2 screen;
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-#endif
-
 in vec2 uv;
 out vec4 Diff;
 out vec4 Spec;

data/shaders/sunlightshadowdebug.frag

@@ -5,24 +5,6 @@ uniform sampler2DArrayShadow shadowtex;
 uniform vec3 direction;
 uniform vec3 col;
 
-#ifdef UBO_DISABLED
-uniform mat4 ViewMatrix;
-uniform mat4 ProjectionMatrix;
-uniform mat4 InverseViewMatrix;
-uniform mat4 InverseProjectionMatrix;
-uniform mat4 ShadowViewProjMatrixes[4];
-#else
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-};
-#endif
-
-
 in vec2 uv;
 out vec4 Diff;
 out vec4 Spec;

data/shaders/tonemap.frag

@@ -6,16 +6,6 @@ uniform float exposure = .09;
 uniform float Lwhite = 1.;
 uniform float vignette_weight = 0.;
 
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 out vec4 FragColor;
 
 vec3 getCIEYxy(vec3 rgbColor);

data/shaders/transparentfog.frag

@@ -7,17 +7,6 @@ uniform float start;
 uniform float end;
 uniform vec3 col;
 
-
-layout (std140) uniform MatrixesData
-{
-    mat4 ViewMatrix;
-    mat4 ProjectionMatrix;
-    mat4 InverseViewMatrix;
-    mat4 InverseProjectionMatrix;
-    mat4 ShadowViewProjMatrixes[4];
-    vec2 screen;
-};
-
 in vec2 uv;
 in vec4 color;
 out vec4 FragColor;

src/graphics/glwrap.cpp

@@ -245,6 +245,22 @@ void initGL()
 #endif
 }
 
+static std::string LoadHeader()
+{
+    std::string result;
+    std::ifstream Stream(file_manager->getAsset("shaders/header.txt").c_str(), std::ios::in);
+
+    if (Stream.is_open())
+    {
+        std::string Line = "";
+        while (getline(Stream, Line))
+            result += "\n" + Line;
+        Stream.close();
+    }
+
+    return result;
+}
+
 // Mostly from shader tutorial
 GLuint LoadShader(const char * file, unsigned type)
 {
@@ -258,6 +274,7 @@ GLuint LoadShader(const char * file, unsigned type)
         Code += "#define UBO_DISABLED\n";
     if (irr_driver->hasVSLayerExtension())
         Code += "#define VSLayer\n";
+    Code += LoadHeader();
     if (Stream.is_open())
     {
         std::string Line = "";
@@ -284,6 +301,7 @@ GLuint LoadShader(const char * file, unsigned type)
         ErrorMessage[0]=0;
         glGetShaderInfoLog(Id, InfoLogLength, NULL, ErrorMessage);
         Log::error("GLWrap", ErrorMessage);
+        Log::error("GLWrap", Code.c_str());
         delete[] ErrorMessage;
     }