From 0243546e4d7d9c2ea72569a9577bf739ac91804e Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Wed, 12 Feb 2014 22:16:10 +0100 Subject: [PATCH] Use an openGL 3.3 compatibility context when available. --- data/shaders/billboard.frag | 2 +- data/shaders/billboard.vert | 2 +- data/shaders/bloom.frag | 2 +- data/shaders/bloomblend.frag | 2 +- data/shaders/bloompower.frag | 2 +- data/shaders/bubble.frag | 2 +- data/shaders/bubble.vert | 2 +- data/shaders/caustics.frag | 2 +- data/shaders/collapse.frag | 2 +- data/shaders/color_levels.frag | 2 +- data/shaders/coloredquad.frag | 2 +- data/shaders/coloredquad.vert | 2 +- data/shaders/colorize.frag | 2 +- data/shaders/colortexturedquad.frag | 2 +- data/shaders/colortexturedquad.vert | 2 +- data/shaders/detailledobject_pass2.frag | 2 +- data/shaders/displace.frag | 2 +- data/shaders/displace.vert | 2 +- data/shaders/farplane.vert | 2 +- data/shaders/flipparticle.vert | 2 +- data/shaders/fog.frag | 2 +- data/shaders/gaussian3h.frag | 2 +- data/shaders/gaussian3v.frag | 2 +- data/shaders/gaussian6h.frag | 2 +- data/shaders/gaussian6v.frag | 2 +- data/shaders/glow.frag | 2 +- data/shaders/godfade.frag | 2 +- data/shaders/godray.frag | 2 +- data/shaders/grass_pass1.vert | 2 +- data/shaders/grass_pass2.vert | 2 +- data/shaders/mipviz.frag | 2 +- data/shaders/mlaa_blend2.frag | 2 +- data/shaders/mlaa_color1.frag | 2 +- data/shaders/mlaa_neigh3.frag | 2 +- data/shaders/mlaa_offset.vert | 2 +- data/shaders/motion_blur.frag | 2 +- data/shaders/motion_blur.vert | 2 +- data/shaders/multiply.frag | 2 +- data/shaders/normalmap.frag | 2 +- data/shaders/normalmap.vert | 2 +- data/shaders/object_pass1.frag | 2 +- data/shaders/object_pass1.vert | 2 +- data/shaders/object_pass2.frag | 2 +- data/shaders/object_pass2.vert | 2 +- data/shaders/object_unlit.frag | 2 +- data/shaders/objectpass.frag | 2 +- data/shaders/objectpass.vert | 2 +- data/shaders/objectpass_ref.frag | 2 +- data/shaders/objectpass_rimlit.frag | 2 +- data/shaders/objectpass_rimlit.vert | 2 +- data/shaders/objectpass_spheremap.frag | 2 +- data/shaders/objectref_pass1.frag | 2 +- data/shaders/objectref_pass1.vert | 2 +- data/shaders/objectref_pass2.frag | 2 +- data/shaders/particle.frag | 2 +- data/shaders/particle.vert | 2 +- data/shaders/particlesimheightmap.vert | 2 +- data/shaders/pass.frag | 2 +- data/shaders/pass.vert | 2 +- data/shaders/penumbrah.frag | 2 +- data/shaders/penumbrav.frag | 2 +- data/shaders/pointemitter.vert | 2 +- data/shaders/pointlight.frag | 2 +- data/shaders/ppdisplace.frag | 2 +- data/shaders/rain.frag | 2 +- data/shaders/rain.vert | 2 +- data/shaders/rainsim.vert | 2 +- data/shaders/screenquad.vert | 2 +- data/shaders/shadow.geom | 2 +- data/shaders/shadow.vert | 2 +- data/shaders/shadowgen.frag | 2 +- data/shaders/shadowimportance.frag | 2 +- data/shaders/shadowimportance.vert | 2 +- data/shaders/shadowpass.frag | 2 +- data/shaders/shadowpass.vert | 2 +- data/shaders/shadowwarph.frag | 2 +- data/shaders/shadowwarpv.frag | 2 +- data/shaders/skinning.vert | 2 +- data/shaders/skybox.frag | 2 +- data/shaders/skybox.vert | 2 +- data/shaders/splatting.frag | 2 +- data/shaders/splatting.vert | 2 +- data/shaders/ssao.frag | 2 +- data/shaders/sunlight.frag | 2 +- data/shaders/sunlightshadow.frag | 2 +- data/shaders/texturedquad.frag | 2 +- data/shaders/texturedquad.vert | 2 +- data/shaders/transparent.frag | 2 +- data/shaders/transparent.vert | 2 +- data/shaders/transparentfog.frag | 2 +- data/shaders/untextured_object.frag | 2 +- data/shaders/untextured_object.vert | 2 +- data/shaders/water.frag | 2 +- data/shaders/water.vert | 2 +- lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp | 5 ++--- lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp | 4 ++-- 96 files changed, 98 insertions(+), 99 deletions(-) diff --git a/data/shaders/billboard.frag b/data/shaders/billboard.frag index d43518c6f..80a4942eb 100644 --- a/data/shaders/billboard.frag +++ b/data/shaders/billboard.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; diff --git a/data/shaders/billboard.vert b/data/shaders/billboard.vert index 9a9f34d28..c707ab548 100644 --- a/data/shaders/billboard.vert +++ b/data/shaders/billboard.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewMatrix; uniform mat4 ProjectionMatrix; uniform vec3 Position; diff --git a/data/shaders/bloom.frag b/data/shaders/bloom.frag index 886b49ea0..5025f23aa 100644 --- a/data/shaders/bloom.frag +++ b/data/shaders/bloom.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform float low; diff --git a/data/shaders/bloomblend.frag b/data/shaders/bloomblend.frag index 8e4031fa6..edcac3f31 100644 --- a/data/shaders/bloomblend.frag +++ b/data/shaders/bloomblend.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; diff --git a/data/shaders/bloompower.frag b/data/shaders/bloompower.frag index f7d4ce4d3..0c29ce9b2 100644 --- a/data/shaders/bloompower.frag +++ b/data/shaders/bloompower.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform float power; uniform sampler2D tex; diff --git a/data/shaders/bubble.frag b/data/shaders/bubble.frag index d344c64ed..0e1f2d4f9 100644 --- a/data/shaders/bubble.frag +++ b/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; diff --git a/data/shaders/bubble.vert b/data/shaders/bubble.vert index f26f0a246..6e9981bfb 100644 --- a/data/shaders/bubble.vert +++ b/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; diff --git a/data/shaders/caustics.frag b/data/shaders/caustics.frag index 5e976a3c8..e92e03a8c 100644 --- a/data/shaders/caustics.frag +++ b/data/shaders/caustics.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform sampler2D caustictex; uniform vec2 dir; diff --git a/data/shaders/collapse.frag b/data/shaders/collapse.frag index 3a7957a68..573631f9a 100644 --- a/data/shaders/collapse.frag +++ b/data/shaders/collapse.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform sampler2D oldtex; uniform vec2 pixel; diff --git a/data/shaders/color_levels.frag b/data/shaders/color_levels.frag index 33bca9d06..58ccee832 100644 --- a/data/shaders/color_levels.frag +++ b/data/shaders/color_levels.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform vec3 inlevel; uniform vec2 outlevel; diff --git a/data/shaders/coloredquad.frag b/data/shaders/coloredquad.frag index 6afba1d06..9216e0503 100644 --- a/data/shaders/coloredquad.frag +++ b/data/shaders/coloredquad.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform ivec4 color; out vec4 FragColor; diff --git a/data/shaders/coloredquad.vert b/data/shaders/coloredquad.vert index 647155235..31c2a0db1 100644 --- a/data/shaders/coloredquad.vert +++ b/data/shaders/coloredquad.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform vec2 center; uniform vec2 size; diff --git a/data/shaders/colorize.frag b/data/shaders/colorize.frag index 160fa4362..b82462c1f 100644 --- a/data/shaders/colorize.frag +++ b/data/shaders/colorize.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform vec3 col; out vec4 FragColor; diff --git a/data/shaders/colortexturedquad.frag b/data/shaders/colortexturedquad.frag index ec885322b..1e14e5985 100644 --- a/data/shaders/colortexturedquad.frag +++ b/data/shaders/colortexturedquad.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; diff --git a/data/shaders/colortexturedquad.vert b/data/shaders/colortexturedquad.vert index b5827a64a..4489e9cbf 100644 --- a/data/shaders/colortexturedquad.vert +++ b/data/shaders/colortexturedquad.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform vec2 center; uniform vec2 size; uniform vec2 texcenter; diff --git a/data/shaders/detailledobject_pass2.frag b/data/shaders/detailledobject_pass2.frag index bc2de52a1..7afaee691 100644 --- a/data/shaders/detailledobject_pass2.frag +++ b/data/shaders/detailledobject_pass2.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D Albedo; uniform sampler2D Detail; uniform sampler2D DiffuseMap; diff --git a/data/shaders/displace.frag b/data/shaders/displace.frag index 1bd731a71..1c22fd42e 100644 --- a/data/shaders/displace.frag +++ b/data/shaders/displace.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform vec2 dir; uniform vec2 dir2; diff --git a/data/shaders/displace.vert b/data/shaders/displace.vert index a59c56656..7c811d4aa 100644 --- a/data/shaders/displace.vert +++ b/data/shaders/displace.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; uniform mat4 ModelViewMatrix; diff --git a/data/shaders/farplane.vert b/data/shaders/farplane.vert index 1f7bc1fb9..eea0eeede 100644 --- a/data/shaders/farplane.vert +++ b/data/shaders/farplane.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform mat4 ModelViewProjectionMatrix; void main() { diff --git a/data/shaders/flipparticle.vert b/data/shaders/flipparticle.vert index d834b7ee9..24ce2773a 100644 --- a/data/shaders/flipparticle.vert +++ b/data/shaders/flipparticle.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ProjectionMatrix; uniform mat4 ViewMatrix; diff --git a/data/shaders/fog.frag b/data/shaders/fog.frag index 120f5734e..60dd7dcf0 100644 --- a/data/shaders/fog.frag +++ b/data/shaders/fog.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform float fogmax; diff --git a/data/shaders/gaussian3h.frag b/data/shaders/gaussian3h.frag index 4e3e3f54d..07f4d4092 100644 --- a/data/shaders/gaussian3h.frag +++ b/data/shaders/gaussian3h.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform vec2 pixel; diff --git a/data/shaders/gaussian3v.frag b/data/shaders/gaussian3v.frag index f5617c9b7..365e25678 100644 --- a/data/shaders/gaussian3v.frag +++ b/data/shaders/gaussian3v.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform vec2 pixel; diff --git a/data/shaders/gaussian6h.frag b/data/shaders/gaussian6h.frag index 6530a9a1a..a2ee0eb26 100644 --- a/data/shaders/gaussian6h.frag +++ b/data/shaders/gaussian6h.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform vec2 pixel; diff --git a/data/shaders/gaussian6v.frag b/data/shaders/gaussian6v.frag index 7a66dfe8c..8150cbbf6 100644 --- a/data/shaders/gaussian6v.frag +++ b/data/shaders/gaussian6v.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform vec2 pixel; diff --git a/data/shaders/glow.frag b/data/shaders/glow.frag index ebf944a31..0821b420a 100644 --- a/data/shaders/glow.frag +++ b/data/shaders/glow.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; diff --git a/data/shaders/godfade.frag b/data/shaders/godfade.frag index f8166b1a6..e44fdec04 100644 --- a/data/shaders/godfade.frag +++ b/data/shaders/godfade.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform vec3 col; out vec4 FragColor; diff --git a/data/shaders/godray.frag b/data/shaders/godray.frag index 3e1c5aad6..83422eb9c 100644 --- a/data/shaders/godray.frag +++ b/data/shaders/godray.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform vec2 sunpos; diff --git a/data/shaders/grass_pass1.vert b/data/shaders/grass_pass1.vert index 49d6859c7..4d38b4f0a 100644 --- a/data/shaders/grass_pass1.vert +++ b/data/shaders/grass_pass1.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform vec3 windDir; uniform mat4 ModelViewProjectionMatrix; uniform mat4 TransposeInverseModelView; diff --git a/data/shaders/grass_pass2.vert b/data/shaders/grass_pass2.vert index 607caa7d0..0d60826ea 100644 --- a/data/shaders/grass_pass2.vert +++ b/data/shaders/grass_pass2.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform vec3 windDir; uniform mat4 ModelViewProjectionMatrix; diff --git a/data/shaders/mipviz.frag b/data/shaders/mipviz.frag index b329a49dc..e63ca8158 100644 --- a/data/shaders/mipviz.frag +++ b/data/shaders/mipviz.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform vec2 texsize; diff --git a/data/shaders/mlaa_blend2.frag b/data/shaders/mlaa_blend2.frag index 3ef21ca57..9514f2e2a 100644 --- a/data/shaders/mlaa_blend2.frag +++ b/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 diff --git a/data/shaders/mlaa_color1.frag b/data/shaders/mlaa_color1.frag index 49828738b..0b8a80141 100644 --- a/data/shaders/mlaa_color1.frag +++ b/data/shaders/mlaa_color1.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility in vec4 offset[2]; in vec2 uv; diff --git a/data/shaders/mlaa_neigh3.frag b/data/shaders/mlaa_neigh3.frag index 5bf5fdc22..68929c321 100644 --- a/data/shaders/mlaa_neigh3.frag +++ b/data/shaders/mlaa_neigh3.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility in vec4 offset[2]; in vec2 uv; out vec4 FragColor; diff --git a/data/shaders/mlaa_offset.vert b/data/shaders/mlaa_offset.vert index 6725e19e6..d1c36cd99 100644 --- a/data/shaders/mlaa_offset.vert +++ b/data/shaders/mlaa_offset.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform vec2 PIXEL_SIZE; uniform mat4 ModelViewProjectionMatrix; diff --git a/data/shaders/motion_blur.frag b/data/shaders/motion_blur.frag index 9521814ad..c12fee1c8 100644 --- a/data/shaders/motion_blur.frag +++ b/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. diff --git a/data/shaders/motion_blur.vert b/data/shaders/motion_blur.vert index 608115086..5c02f2bd3 100644 --- a/data/shaders/motion_blur.vert +++ b/data/shaders/motion_blur.vert @@ -17,7 +17,7 @@ // motion_blur.vert -#version 130 +#version 330 compatibility void main() { diff --git a/data/shaders/multiply.frag b/data/shaders/multiply.frag index ca9cbd8fa..1e9303bf1 100644 --- a/data/shaders/multiply.frag +++ b/data/shaders/multiply.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex1; uniform sampler2D tex2; diff --git a/data/shaders/normalmap.frag b/data/shaders/normalmap.frag index f977e5e46..00410d916 100644 --- a/data/shaders/normalmap.frag +++ b/data/shaders/normalmap.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D normalMap; noperspective in vec3 tangent; diff --git a/data/shaders/normalmap.vert b/data/shaders/normalmap.vert index 13b53645e..b7f74865d 100644 --- a/data/shaders/normalmap.vert +++ b/data/shaders/normalmap.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; uniform mat4 TransposeInverseModelView; diff --git a/data/shaders/object_pass1.frag b/data/shaders/object_pass1.frag index 5c47fafc7..ff55a147d 100644 --- a/data/shaders/object_pass1.frag +++ b/data/shaders/object_pass1.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 noperspective in vec3 nor; out vec2 EncodedNormal; diff --git a/data/shaders/object_pass1.vert b/data/shaders/object_pass1.vert index 649dd13dc..edf27d885 100644 --- a/data/shaders/object_pass1.vert +++ b/data/shaders/object_pass1.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; uniform mat4 TransposeInverseModelView; diff --git a/data/shaders/object_pass2.frag b/data/shaders/object_pass2.frag index fbcd05641..7d4d81c27 100644 --- a/data/shaders/object_pass2.frag +++ b/data/shaders/object_pass2.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D Albedo; uniform sampler2D DiffuseMap; uniform sampler2D SpecularMap; diff --git a/data/shaders/object_pass2.vert b/data/shaders/object_pass2.vert index 4ac051f76..b20eeac18 100644 --- a/data/shaders/object_pass2.vert +++ b/data/shaders/object_pass2.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; in vec3 Position; diff --git a/data/shaders/object_unlit.frag b/data/shaders/object_unlit.frag index d5874242b..3677baae3 100644 --- a/data/shaders/object_unlit.frag +++ b/data/shaders/object_unlit.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; out vec4 FragColor; diff --git a/data/shaders/objectpass.frag b/data/shaders/objectpass.frag index 3ecc698ba..436679563 100644 --- a/data/shaders/objectpass.frag +++ b/data/shaders/objectpass.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform sampler2D lighttex; uniform int hastex; diff --git a/data/shaders/objectpass.vert b/data/shaders/objectpass.vert index f40e32215..877192df0 100644 --- a/data/shaders/objectpass.vert +++ b/data/shaders/objectpass.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; uniform mat4 TransposeInverseModelView; uniform mat4 TextureMatrix0; diff --git a/data/shaders/objectpass_ref.frag b/data/shaders/objectpass_ref.frag index 43915ee90..38b42a644 100644 --- a/data/shaders/objectpass_ref.frag +++ b/data/shaders/objectpass_ref.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform int hastex; uniform float objectid; diff --git a/data/shaders/objectpass_rimlit.frag b/data/shaders/objectpass_rimlit.frag index 7e701338d..a17f533b9 100644 --- a/data/shaders/objectpass_rimlit.frag +++ b/data/shaders/objectpass_rimlit.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D Albedo; uniform sampler2D DiffuseMap; uniform sampler2D SpecularMap; diff --git a/data/shaders/objectpass_rimlit.vert b/data/shaders/objectpass_rimlit.vert index adf0c9477..7910ebb75 100644 --- a/data/shaders/objectpass_rimlit.vert +++ b/data/shaders/objectpass_rimlit.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; uniform mat4 TransposeInverseModelView; diff --git a/data/shaders/objectpass_spheremap.frag b/data/shaders/objectpass_spheremap.frag index b46610199..9d726b99a 100644 --- a/data/shaders/objectpass_spheremap.frag +++ b/data/shaders/objectpass_spheremap.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; noperspective in vec3 nor; diff --git a/data/shaders/objectref_pass1.frag b/data/shaders/objectref_pass1.frag index 8c5500dbd..06c8c413e 100644 --- a/data/shaders/objectref_pass1.frag +++ b/data/shaders/objectref_pass1.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; noperspective in vec3 nor; diff --git a/data/shaders/objectref_pass1.vert b/data/shaders/objectref_pass1.vert index e75896eeb..462efa8ab 100644 --- a/data/shaders/objectref_pass1.vert +++ b/data/shaders/objectref_pass1.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; uniform mat4 TransposeInverseModelView; diff --git a/data/shaders/objectref_pass2.frag b/data/shaders/objectref_pass2.frag index 5c1589f98..e48755946 100644 --- a/data/shaders/objectref_pass2.frag +++ b/data/shaders/objectref_pass2.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D Albedo; uniform sampler2D DiffuseMap; uniform sampler2D SpecularMap; diff --git a/data/shaders/particle.frag b/data/shaders/particle.frag index 0c841cf5b..1b6c5f200 100644 --- a/data/shaders/particle.frag +++ b/data/shaders/particle.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform sampler2D dtex; uniform mat4 invproj; diff --git a/data/shaders/particle.vert b/data/shaders/particle.vert index fcfc3af0d..73b0dd8de 100644 --- a/data/shaders/particle.vert +++ b/data/shaders/particle.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ProjectionMatrix; uniform mat4 ViewMatrix; diff --git a/data/shaders/particlesimheightmap.vert b/data/shaders/particlesimheightmap.vert index c731612db..09fa55a98 100644 --- a/data/shaders/particlesimheightmap.vert +++ b/data/shaders/particlesimheightmap.vert @@ -1,4 +1,4 @@ -#version 140 +#version 330 uniform int dt; uniform mat4 sourcematrix; uniform int level; diff --git a/data/shaders/pass.frag b/data/shaders/pass.frag index e736e2326..327fcdffc 100644 --- a/data/shaders/pass.frag +++ b/data/shaders/pass.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; out vec4 FragColor; diff --git a/data/shaders/pass.vert b/data/shaders/pass.vert index 8911049be..f2003abef 100644 --- a/data/shaders/pass.vert +++ b/data/shaders/pass.vert @@ -1,5 +1,5 @@ // Passthrough shader for drawQuad() -#version 130 +#version 330 compatibility out vec2 uv; diff --git a/data/shaders/penumbrah.frag b/data/shaders/penumbrah.frag index 4f18e8f5a..ab8888c29 100644 --- a/data/shaders/penumbrah.frag +++ b/data/shaders/penumbrah.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform vec2 pixel; diff --git a/data/shaders/penumbrav.frag b/data/shaders/penumbrav.frag index 790b86d02..229fa6e20 100644 --- a/data/shaders/penumbrav.frag +++ b/data/shaders/penumbrav.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform vec2 pixel; diff --git a/data/shaders/pointemitter.vert b/data/shaders/pointemitter.vert index ea29258b7..64a498dc7 100644 --- a/data/shaders/pointemitter.vert +++ b/data/shaders/pointemitter.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform int dt; uniform mat4 sourcematrix; uniform int level; diff --git a/data/shaders/pointlight.frag b/data/shaders/pointlight.frag index 06a2552f3..f21f49492 100644 --- a/data/shaders/pointlight.frag +++ b/data/shaders/pointlight.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D ntex; uniform sampler2D dtex; diff --git a/data/shaders/ppdisplace.frag b/data/shaders/ppdisplace.frag index 4b2d13248..717f77881 100644 --- a/data/shaders/ppdisplace.frag +++ b/data/shaders/ppdisplace.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform sampler2D dtex; diff --git a/data/shaders/rain.frag b/data/shaders/rain.frag index 493a63f6a..4fb5ad597 100644 --- a/data/shaders/rain.frag +++ b/data/shaders/rain.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform sampler2D normals_and_depth; uniform mat4 invproj; diff --git a/data/shaders/rain.vert b/data/shaders/rain.vert index 77832bfd5..7ac11bc00 100644 --- a/data/shaders/rain.vert +++ b/data/shaders/rain.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform float screenw; void main() diff --git a/data/shaders/rainsim.vert b/data/shaders/rainsim.vert index 4c7a29d98..0a57b8671 100644 --- a/data/shaders/rainsim.vert +++ b/data/shaders/rainsim.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform float time; uniform vec3 campos; uniform mat4 viewm; diff --git a/data/shaders/screenquad.vert b/data/shaders/screenquad.vert index ac88dba7a..1ba822b26 100644 --- a/data/shaders/screenquad.vert +++ b/data/shaders/screenquad.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 in vec2 Position; in vec2 Texcoord; diff --git a/data/shaders/shadow.geom b/data/shaders/shadow.geom index 9dc5cbe93..17754b677 100644 --- a/data/shaders/shadow.geom +++ b/data/shaders/shadow.geom @@ -1,4 +1,4 @@ -#version 330 core +#version 330 uniform mat4 ModelViewProjectionMatrix[4]; layout(triangles) in; diff --git a/data/shaders/shadow.vert b/data/shaders/shadow.vert index 5dbf07048..0bff7c743 100644 --- a/data/shaders/shadow.vert +++ b/data/shaders/shadow.vert @@ -1,4 +1,4 @@ -#version 330 core +#version 330 in vec3 Position; in vec2 Texcoord; diff --git a/data/shaders/shadowgen.frag b/data/shaders/shadowgen.frag index 5ee4a2a93..9cef0fbd6 100644 --- a/data/shaders/shadowgen.frag +++ b/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; diff --git a/data/shaders/shadowimportance.frag b/data/shaders/shadowimportance.frag index 50b2edc25..1bcc21cd0 100644 --- a/data/shaders/shadowimportance.frag +++ b/data/shaders/shadowimportance.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D ntex; uniform sampler2D ctex; uniform vec3 campos; diff --git a/data/shaders/shadowimportance.vert b/data/shaders/shadowimportance.vert index 938aeabe9..bb3a8b4b9 100644 --- a/data/shaders/shadowimportance.vert +++ b/data/shaders/shadowimportance.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D dtex; uniform mat4 ipvmat; uniform mat4 shadowmat; diff --git a/data/shaders/shadowpass.frag b/data/shaders/shadowpass.frag index a6bb31048..bcec0ee01 100644 --- a/data/shaders/shadowpass.frag +++ b/data/shaders/shadowpass.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform int hastex; uniform int viz; diff --git a/data/shaders/shadowpass.vert b/data/shaders/shadowpass.vert index 7233ab0d1..009f4b295 100644 --- a/data/shaders/shadowpass.vert +++ b/data/shaders/shadowpass.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D warpx; uniform sampler2D warpy; diff --git a/data/shaders/shadowwarph.frag b/data/shaders/shadowwarph.frag index 820c24d41..38d46dd89 100644 --- a/data/shaders/shadowwarph.frag +++ b/data/shaders/shadowwarph.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform int size; uniform vec2 pixel; diff --git a/data/shaders/shadowwarpv.frag b/data/shaders/shadowwarpv.frag index fb3a0b0fd..5491d8f21 100644 --- a/data/shaders/shadowwarpv.frag +++ b/data/shaders/shadowwarpv.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 compatibility uniform sampler2D tex; uniform int size; uniform vec2 pixel; diff --git a/data/shaders/skinning.vert b/data/shaders/skinning.vert index 2f2e0d083..e9d4dd144 100644 --- a/data/shaders/skinning.vert +++ b/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 diff --git a/data/shaders/skybox.frag b/data/shaders/skybox.frag index ab9eda8f5..1d150e975 100644 --- a/data/shaders/skybox.frag +++ b/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; diff --git a/data/shaders/skybox.vert b/data/shaders/skybox.vert index 1db3a3480..7d3097ca5 100644 --- a/data/shaders/skybox.vert +++ b/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; diff --git a/data/shaders/splatting.frag b/data/shaders/splatting.frag index 31bf34f71..38a8e9631 100644 --- a/data/shaders/splatting.frag +++ b/data/shaders/splatting.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex_layout; uniform sampler2D tex_detail0; uniform sampler2D tex_detail1; diff --git a/data/shaders/splatting.vert b/data/shaders/splatting.vert index 772b957f3..c1a779ef1 100644 --- a/data/shaders/splatting.vert +++ b/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; diff --git a/data/shaders/ssao.frag b/data/shaders/ssao.frag index 5af8b3819..1ae1cba7d 100644 --- a/data/shaders/ssao.frag +++ b/data/shaders/ssao.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D ntex; uniform sampler2D dtex; uniform sampler2D noise_texture; diff --git a/data/shaders/sunlight.frag b/data/shaders/sunlight.frag index c6519c5d9..68c1049ed 100644 --- a/data/shaders/sunlight.frag +++ b/data/shaders/sunlight.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D ntex; uniform sampler2D dtex; //uniform sampler2D cloudtex; diff --git a/data/shaders/sunlightshadow.frag b/data/shaders/sunlightshadow.frag index df53c2bf7..d2b2df054 100644 --- a/data/shaders/sunlightshadow.frag +++ b/data/shaders/sunlightshadow.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D ntex; uniform sampler2D dtex; uniform sampler2DArrayShadow shadowtex; diff --git a/data/shaders/texturedquad.frag b/data/shaders/texturedquad.frag index 6a83ac1fe..48f7335b7 100644 --- a/data/shaders/texturedquad.frag +++ b/data/shaders/texturedquad.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; diff --git a/data/shaders/texturedquad.vert b/data/shaders/texturedquad.vert index 668c52eb5..e8a73d3b8 100644 --- a/data/shaders/texturedquad.vert +++ b/data/shaders/texturedquad.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform vec2 center; uniform vec2 size; uniform vec2 texcenter; diff --git a/data/shaders/transparent.frag b/data/shaders/transparent.frag index b891b6f92..e5b1e7c69 100644 --- a/data/shaders/transparent.frag +++ b/data/shaders/transparent.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; in vec2 uv; diff --git a/data/shaders/transparent.vert b/data/shaders/transparent.vert index 9b841a47f..b6ac8f61a 100644 --- a/data/shaders/transparent.vert +++ b/data/shaders/transparent.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; in vec3 Position; diff --git a/data/shaders/transparentfog.frag b/data/shaders/transparentfog.frag index f5365d011..545587044 100644 --- a/data/shaders/transparentfog.frag +++ b/data/shaders/transparentfog.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D tex; uniform float fogmax; diff --git a/data/shaders/untextured_object.frag b/data/shaders/untextured_object.frag index ccbc54ab9..24f4a54be 100644 --- a/data/shaders/untextured_object.frag +++ b/data/shaders/untextured_object.frag @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform sampler2D DiffuseMap; uniform sampler2D SpecularMap; uniform sampler2D SSAO; diff --git a/data/shaders/untextured_object.vert b/data/shaders/untextured_object.vert index 3ef97ca4b..5f0f91cf7 100644 --- a/data/shaders/untextured_object.vert +++ b/data/shaders/untextured_object.vert @@ -1,4 +1,4 @@ -#version 130 +#version 330 uniform mat4 ModelViewProjectionMatrix; in vec3 Position; diff --git a/data/shaders/water.frag b/data/shaders/water.frag index fc106fb29..1e9d434b3 100644 --- a/data/shaders/water.frag +++ b/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 diff --git a/data/shaders/water.vert b/data/shaders/water.vert index ab1d05c5b..78a1fe5c5 100644 --- a/data/shaders/water.vert +++ b/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; diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp index de2c76d61..4829cf72c 100644 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceLinux.cpp +++ b/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, - // Uncomment to discard deprecated features - //GLX_CONTEXT_FLAGS_ARB , GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, + GLX_CONTEXT_MINOR_VERSION_ARB, 3, + GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, //GLX_CONTEXT_CORE_PROFILE_BIT_ARB GLX_CONTEXT_FLAGS_ARB, GLX_CONTEXT_DEBUG_BIT_ARB, None }; diff --git a/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp b/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp index 50076bf1a..9db511551 100644 --- a/lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp +++ b/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_FLAGS_ARB, WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, + WGL_CONTEXT_MINOR_VERSION_ARB, 3, 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);