Use an openGL 3.3 compatibility context when available.

data/shaders/billboard.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/billboard.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewMatrix;
 uniform mat4 ProjectionMatrix;
 uniform vec3 Position;

data/shaders/bloom.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform float low;
 

data/shaders/bloomblend.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/bloompower.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform float power;
 uniform sampler2D tex;
 

data/shaders/bubble.frag

@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform float transparency;
 in vec2 uv;

data/shaders/bubble.vert

@@ -17,7 +17,7 @@
 
 
 // Creates a bubble (wave) effect by distorting the texture depending on time
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform float time;
 

data/shaders/caustics.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D caustictex;
 uniform vec2 dir;

data/shaders/collapse.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D oldtex;
 uniform vec2 pixel;

data/shaders/color_levels.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec3 inlevel;
 uniform vec2 outlevel;

data/shaders/coloredquad.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform ivec4 color;
 
 out vec4 FragColor;

data/shaders/coloredquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec2 center;
 uniform vec2 size;
 

data/shaders/colorize.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec3 col;
 
 out vec4 FragColor;

data/shaders/colortexturedquad.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/colortexturedquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec2 center;
 uniform vec2 size;
 uniform vec2 texcenter;

data/shaders/detailledobject_pass2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D Detail;
 uniform sampler2D DiffuseMap;

data/shaders/displace.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 dir;
 uniform vec2 dir2;

data/shaders/displace.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 ModelViewMatrix;
 

data/shaders/farplane.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform mat4 ModelViewProjectionMatrix;
 
 void main() {

data/shaders/flipparticle.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ProjectionMatrix;
 uniform mat4 ViewMatrix;
 

data/shaders/fog.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 uniform float fogmax;

data/shaders/gaussian3h.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/gaussian3v.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/gaussian6h.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/gaussian6v.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/glow.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/godfade.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform vec3 col;
 out vec4 FragColor;

data/shaders/godray.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform vec2 sunpos;
 

data/shaders/grass_pass1.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec3 windDir;
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;

data/shaders/grass_pass2.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec3 windDir;
 uniform mat4 ModelViewProjectionMatrix;
 

data/shaders/mipviz.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 
 uniform sampler2D tex;
 uniform vec2 texsize;

data/shaders/mlaa_blend2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 #define MAX_SEARCH_STEPS 8.0
 #define MAX_DISTANCE 33.0
 

data/shaders/mlaa_color1.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 in vec4 offset[2];
 in vec2 uv;
 

data/shaders/mlaa_neigh3.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 in vec4 offset[2];
 in vec2 uv;
 out vec4 FragColor;

data/shaders/mlaa_offset.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform vec2 PIXEL_SIZE;
 uniform mat4 ModelViewProjectionMatrix;
 

data/shaders/motion_blur.frag

@@ -21,7 +21,7 @@
 // The actual boost amount (which linearly scales the blur to be shown).
 // should be in the range [0.0, 1.0], though a larger value might make
 // the blurring too string. Atm we are using [0, 0.5].
-#version 130
+#version 330 compatibility
 uniform float boost_amount;
 
 // The color buffer to use.

data/shaders/motion_blur.vert

@@ -17,7 +17,7 @@
 
 
 // motion_blur.vert
-#version 130
+#version 330 compatibility
 
 void main()
 {

data/shaders/multiply.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex1;
 uniform sampler2D tex2;
 

data/shaders/normalmap.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D normalMap;
 
 noperspective in vec3 tangent;

data/shaders/normalmap.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/object_pass1.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 noperspective in vec3 nor;
 out vec2 EncodedNormal;
 

data/shaders/object_pass1.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/object_pass2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;

data/shaders/object_pass2.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 
 in vec3 Position;

data/shaders/object_unlit.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 in vec2 uv;
 out vec4 FragColor;

data/shaders/objectpass.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform sampler2D lighttex;
 uniform int hastex;

data/shaders/objectpass.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 uniform mat4 TextureMatrix0;

data/shaders/objectpass_ref.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform int hastex;
 uniform float objectid;

data/shaders/objectpass_rimlit.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;

data/shaders/objectpass_rimlit.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/objectpass_spheremap.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 noperspective in vec3 nor;

data/shaders/objectref_pass1.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 noperspective in vec3 nor;

data/shaders/objectref_pass1.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/objectref_pass2.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D Albedo;
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;

data/shaders/particle.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform sampler2D dtex;
 uniform mat4 invproj;

data/shaders/particle.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ProjectionMatrix;
 uniform mat4 ViewMatrix;
 

data/shaders/particlesimheightmap.vert

@@ -1,4 +1,4 @@
-#version 140
+#version 330
 uniform int dt;
 uniform mat4 sourcematrix;
 uniform int level;

data/shaders/pass.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 
 out vec4 FragColor;

data/shaders/pass.vert

@@ -1,5 +1,5 @@
 // Passthrough shader for drawQuad()
-#version 130
+#version 330 compatibility
 
 out vec2 uv;
 

data/shaders/penumbrah.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/penumbrav.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform vec2 pixel;
 

data/shaders/pointemitter.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform int dt;
 uniform mat4 sourcematrix;
 uniform int level;

data/shaders/pointlight.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 

data/shaders/ppdisplace.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform sampler2D dtex;
 

data/shaders/rain.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 uniform sampler2D normals_and_depth;
 uniform mat4 invproj;

data/shaders/rain.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform float screenw;
 
 void main()

data/shaders/rainsim.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform float time;
 uniform vec3 campos;
 uniform mat4 viewm;

data/shaders/screenquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 
 in vec2 Position;
 in vec2 Texcoord;

data/shaders/shadow.geom

@@ -1,4 +1,4 @@
-#version 330 core
+#version 330
 uniform mat4 ModelViewProjectionMatrix[4];
 
 layout(triangles) in;

data/shaders/shadow.vert

@@ -1,4 +1,4 @@
-#version 330 core
+#version 330
 
 in vec3 Position;
 in vec2 Texcoord;

data/shaders/shadowgen.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D halft; // half is a reserved word
 uniform sampler2D quarter;
 uniform sampler2D eighth;

data/shaders/shadowimportance.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D ntex;
 uniform sampler2D ctex;
 uniform vec3 campos;

data/shaders/shadowimportance.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D dtex;
 uniform mat4 ipvmat;
 uniform mat4 shadowmat;

data/shaders/shadowpass.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform int hastex;
 uniform int viz;

data/shaders/shadowpass.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D warpx;
 uniform sampler2D warpy;
 

data/shaders/shadowwarph.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform int size;
 uniform vec2 pixel;

data/shaders/shadowwarpv.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform int size;
 uniform vec2 pixel;

data/shaders/skinning.vert

@@ -16,7 +16,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // skinning.vert
-#version 130
+#version 330 compatibility
 #define MAX_JOINT_NUM 36
 #define MAX_LIGHT_NUM 8
 

data/shaders/skybox.frag

@@ -14,7 +14,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#version 130
+#version 330 compatibility
 uniform sampler2D tex;
 uniform sampler2D glow_tex;
 uniform float transparency;

data/shaders/skybox.vert

@@ -17,7 +17,7 @@
 
 
 // Creates a bubble (wave) effect by distorting the texture depending on time
-#version 130
+#version 330 compatibility
 uniform mat4 ModelViewProjectionMatrix;
 uniform float time;
 

data/shaders/splatting.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex_layout;
 uniform sampler2D tex_detail0;
 uniform sampler2D tex_detail1;

data/shaders/splatting.vert

@@ -15,7 +15,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 uniform mat4 TransposeInverseModelView;
 

data/shaders/ssao.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 uniform sampler2D noise_texture;

data/shaders/sunlight.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 //uniform sampler2D cloudtex;

data/shaders/sunlightshadow.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D ntex;
 uniform sampler2D dtex;
 uniform sampler2DArrayShadow shadowtex;

data/shaders/texturedquad.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/texturedquad.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform vec2 center;
 uniform vec2 size;
 uniform vec2 texcenter;

data/shaders/transparent.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 in vec2 uv;

data/shaders/transparent.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 
 in vec3 Position;

data/shaders/transparentfog.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D tex;
 
 uniform float fogmax;

data/shaders/untextured_object.frag

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;
 uniform sampler2D SSAO;

data/shaders/untextured_object.vert

@@ -1,4 +1,4 @@
-#version 130
+#version 330
 uniform mat4 ModelViewProjectionMatrix;
 
 in vec3 Position;

data/shaders/water.frag

@@ -1,6 +1,6 @@
 // Shader based on work by Fabien Sanglard
 // Released under the terms of CC-BY 3.0
-#version 130
+#version 330 compatibility
 uniform sampler2D BumpTex1; // Normal map 1
 uniform sampler2D BumpTex2; // Normal map 2
 uniform sampler2D DecalTex; //The texture

data/shaders/water.vert

@@ -1,6 +1,6 @@
 // Shader based on work by Fabien Sanglard
 // Released under the terms of CC-BY 3.0
-#version 130
+#version 330 compatibility
 uniform float speed;
 uniform float height;
 uniform float waveLength;

lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp

@@ -744,9 +744,8 @@ bool CIrrDeviceLinux::createWindow()
 			int context_attribs[] =
 				{
 					GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
-					GLX_CONTEXT_MINOR_VERSION_ARB, 0,
+					GLX_CONTEXT_MINOR_VERSION_ARB, 3,
-					// Uncomment to discard deprecated features
+                    GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, //GLX_CONTEXT_CORE_PROFILE_BIT_ARB
-					//GLX_CONTEXT_FLAGS_ARB        , GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
 					GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_DEBUG_BIT_ARB,
 					None
 				};

lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp

@@ -412,9 +412,9 @@ bool COpenGLDriver::initDriver(CIrrDeviceWin32* device)
 		int iAttribs[] =
 		{
 			WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
-			WGL_CONTEXT_MINOR_VERSION_ARB, 1,
+			WGL_CONTEXT_MINOR_VERSION_ARB, 3,
-			//WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
 			WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
+            WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, //WGL_CONTEXT_CORE_PROFILE_BIT_ARB
 			0
 		};
 		hrc=wglCreateContextAttribs_ARB(HDc, 0, iAttribs);