diff --git a/shader/Old/basicTexture.frag b/shader/Old/basicTexture.frag index a1cefb0e9..3543d4dd9 100644 --- a/shader/Old/basicTexture.frag +++ b/shader/Old/basicTexture.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core out vec4 FragColor; in vec4 gColor; diff --git a/shader/Old/basicTexture.geom b/shader/Old/basicTexture.geom index a3e1851e4..fcae997ef 100644 --- a/shader/Old/basicTexture.geom +++ b/shader/Old/basicTexture.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/Old/basicTexture.vert b/shader/Old/basicTexture.vert index cc19a07cd..7f0241cd0 100644 --- a/shader/Old/basicTexture.vert +++ b/shader/Old/basicTexture.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 aPos; layout (location = 1) in vec4 aColor; layout (location = 2) in vec2 aTexCoord; diff --git a/shader/Old/circle.frag b/shader/Old/circle.frag index 1396eaf73..827d27531 100644 --- a/shader/Old/circle.frag +++ b/shader/Old/circle.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 gColor; in vec2 cenPosT; in float gRad; diff --git a/shader/Old/circle.geom b/shader/Old/circle.geom index 2096c3d45..db74b9bd5 100644 --- a/shader/Old/circle.geom +++ b/shader/Old/circle.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/Old/circle.vert b/shader/Old/circle.vert index e7e584a65..20d318770 100644 --- a/shader/Old/circle.vert +++ b/shader/Old/circle.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in float rad; diff --git a/shader/Old/fadeCircle.frag b/shader/Old/fadeCircle.frag index 953111146..233f389fa 100644 --- a/shader/Old/fadeCircle.frag +++ b/shader/Old/fadeCircle.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 cenPosT; in vec2 gParams; out vec4 fColor; diff --git a/shader/Old/fadeCircle.geom b/shader/Old/fadeCircle.geom index 1f1122440..83e5a58ee 100644 --- a/shader/Old/fadeCircle.geom +++ b/shader/Old/fadeCircle.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec2 vParams []; diff --git a/shader/Old/fadeCircle.vert b/shader/Old/fadeCircle.vert index 0498314fe..d0046b81c 100644 --- a/shader/Old/fadeCircle.vert +++ b/shader/Old/fadeCircle.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 position; out vec2 vParams; diff --git a/shader/Old/fullFadeCircle.frag b/shader/Old/fullFadeCircle.frag index 45ca0c969..330e635bc 100644 --- a/shader/Old/fullFadeCircle.frag +++ b/shader/Old/fullFadeCircle.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 gColor; in vec2 cenPosTrans; in float gRad; diff --git a/shader/Old/fullFadeCircle.geom b/shader/Old/fullFadeCircle.geom index 4d696433c..c73cddc4a 100644 --- a/shader/Old/fullFadeCircle.geom +++ b/shader/Old/fullFadeCircle.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/Old/fullFadeCircle.vert b/shader/Old/fullFadeCircle.vert index 2046f8894..97e46987f 100644 --- a/shader/Old/fullFadeCircle.vert +++ b/shader/Old/fullFadeCircle.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in float rad; diff --git a/shader/Old/wall.frag b/shader/Old/wall.frag index 7a98ee78b..c7f9f5964 100644 --- a/shader/Old/wall.frag +++ b/shader/Old/wall.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vParams; out vec4 fColor; diff --git a/shader/Old/wall.geom b/shader/Old/wall.geom index 374fb5b35..f8c369cd9 100644 --- a/shader/Old/wall.geom +++ b/shader/Old/wall.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 4) out; diff --git a/shader/Old/wall.vert b/shader/Old/wall.vert index 678feae17..03694c401 100644 --- a/shader/Old/wall.vert +++ b/shader/Old/wall.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec4 params; diff --git a/shader/Old/wallLight.frag b/shader/Old/wallLight.frag index 6721a2496..4488c6b62 100644 --- a/shader/Old/wallLight.frag +++ b/shader/Old/wallLight.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vDistField; in float vLum; out vec4 fColor; diff --git a/shader/Old/wallLight.geom b/shader/Old/wallLight.geom index 51474aea1..884326f2a 100644 --- a/shader/Old/wallLight.geom +++ b/shader/Old/wallLight.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (lines) in; layout (triangle_strip, max_vertices = 14) out; diff --git a/shader/Old/wallLight.vert b/shader/Old/wallLight.vert index c708455f3..86e77c379 100644 --- a/shader/Old/wallLight.vert +++ b/shader/Old/wallLight.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; out vec2 vDistField; diff --git a/shader/background.frag b/shader/background.frag index 846d95e59..613fed2e0 100644 --- a/shader/background.frag +++ b/shader/background.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 gTexPos; out vec4 fColor; diff --git a/shader/background.geom b/shader/background.geom index e2d3dbe37..3c9e898ce 100644 --- a/shader/background.geom +++ b/shader/background.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec2 vRad1; diff --git a/shader/background.vert b/shader/background.vert index 879051755..58e3a2284 100644 --- a/shader/background.vert +++ b/shader/background.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 params; layout (location = 1) in vec2 texCoor; void main() diff --git a/shader/blur.frag b/shader/blur.frag index dfeb65157..e256bbd61 100644 --- a/shader/blur.frag +++ b/shader/blur.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/dualTwoD/arc.frag b/shader/dualTwoD/arc.frag index c504455ac..f8595b223 100644 --- a/shader/dualTwoD/arc.frag +++ b/shader/dualTwoD/arc.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vCol; in vec3 vPos; in vec3 vparams; diff --git a/shader/dualTwoD/arc.vert b/shader/dualTwoD/arc.vert index 1c946f7df..8abb4c6d6 100644 --- a/shader/dualTwoD/arc.vert +++ b/shader/dualTwoD/arc.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec4 col; layout (location = 2) in vec3 boxXboxYwidth; diff --git a/shader/dualTwoD/basic.frag b/shader/dualTwoD/basic.frag index 285781782..62e8b8b09 100644 --- a/shader/dualTwoD/basic.frag +++ b/shader/dualTwoD/basic.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vCol; in vec3 vPos; layout (location=0) out vec4 fCol; diff --git a/shader/dualTwoD/basic.vert b/shader/dualTwoD/basic.vert index ff9343bc1..5493eb2e8 100644 --- a/shader/dualTwoD/basic.vert +++ b/shader/dualTwoD/basic.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec4 col; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/dualTwoD/basicTweakZ.frag b/shader/dualTwoD/basicTweakZ.frag index 28a4dba68..456dcee8d 100644 --- a/shader/dualTwoD/basicTweakZ.frag +++ b/shader/dualTwoD/basicTweakZ.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location=0) out vec4 fCol; layout (location=1) out vec4 fPos; in vec4 vCol; diff --git a/shader/dualTwoD/basicTweakZ.vert b/shader/dualTwoD/basicTweakZ.vert index d7322a162..f7ac2c0b3 100644 --- a/shader/dualTwoD/basicTweakZ.vert +++ b/shader/dualTwoD/basicTweakZ.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 position; layout (location = 1) in vec4 color; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/dualTwoD/bezierQuad.frag b/shader/dualTwoD/bezierQuad.frag index 484d99ee6..2edc9f57b 100644 --- a/shader/dualTwoD/bezierQuad.frag +++ b/shader/dualTwoD/bezierQuad.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; in vec2 boxOut; in vec2 boxIn; diff --git a/shader/dualTwoD/bezierQuad.geom b/shader/dualTwoD/bezierQuad.geom index 49b526cf3..08192de52 100644 --- a/shader/dualTwoD/bezierQuad.geom +++ b/shader/dualTwoD/bezierQuad.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 5) out; in vec4 vColor[]; diff --git a/shader/dualTwoD/bezierQuad.vert b/shader/dualTwoD/bezierQuad.vert index efa5da739..140be3f3d 100644 --- a/shader/dualTwoD/bezierQuad.vert +++ b/shader/dualTwoD/bezierQuad.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in vec4 boxes; diff --git a/shader/dualTwoD/character.frag b/shader/dualTwoD/character.frag index 6bffa7e30..0b1665a16 100644 --- a/shader/dualTwoD/character.frag +++ b/shader/dualTwoD/character.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location=0) out vec4 fCol; layout (location=1) out vec4 fPos; uniform sampler2D aTexture; diff --git a/shader/dualTwoD/character.geom b/shader/dualTwoD/character.geom index b9216385c..790b13808 100644 --- a/shader/dualTwoD/character.geom +++ b/shader/dualTwoD/character.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/dualTwoD/character.vert b/shader/dualTwoD/character.vert index 342ad1acf..6d6fd6d00 100644 --- a/shader/dualTwoD/character.vert +++ b/shader/dualTwoD/character.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 aPos; layout (location = 1) in vec4 aColor; layout (location = 2) in vec2 aTexCoord; diff --git a/shader/dualTwoD/ellipse.frag b/shader/dualTwoD/ellipse.frag index 2bacff194..75d8ca49f 100644 --- a/shader/dualTwoD/ellipse.frag +++ b/shader/dualTwoD/ellipse.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location=0) out vec4 fCol; layout (location=1) out vec4 fPos; in vec4 gColC; diff --git a/shader/dualTwoD/ellipse.geom b/shader/dualTwoD/ellipse.geom index 1dc844c2b..c2028c0c1 100644 --- a/shader/dualTwoD/ellipse.geom +++ b/shader/dualTwoD/ellipse.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/dualTwoD/ellipse.vert b/shader/dualTwoD/ellipse.vert index 8b193eb53..ef8d8e737 100644 --- a/shader/dualTwoD/ellipse.vert +++ b/shader/dualTwoD/ellipse.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec4 col; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/fullscreen/alphaHalve.frag b/shader/fullscreen/alphaHalve.frag index 3d71d0ae8..34587482c 100644 --- a/shader/fullscreen/alphaHalve.frag +++ b/shader/fullscreen/alphaHalve.frag @@ -1,3 +1,3 @@ -#version 430 core +#version 450 core out vec4 fColor; void main () { fColor = vec4(0,0,0,0.5);} diff --git a/shader/fullscreen/alphaHalve.vert b/shader/fullscreen/alphaHalve.vert index cd3e48618..fee65c84b 100644 --- a/shader/fullscreen/alphaHalve.vert +++ b/shader/fullscreen/alphaHalve.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 position; void main() { gl_Position = vec4 (position, 0 , 1);} diff --git a/shader/horizontalBlur.frag b/shader/horizontalBlur.frag index 680fd7d5a..5aa964e85 100644 --- a/shader/horizontalBlur.frag +++ b/shader/horizontalBlur.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/lighting/cap.frag b/shader/lighting/cap.frag index b4133d625..dce8299ad 100644 --- a/shader/lighting/cap.frag +++ b/shader/lighting/cap.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core out vec4 fColor; void main() { diff --git a/shader/lighting/cap.geom b/shader/lighting/cap.geom index 63d4c521c..4280f8e2e 100644 --- a/shader/lighting/cap.geom +++ b/shader/lighting/cap.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 3) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/lighting/cap.vert b/shader/lighting/cap.vert index ec2a9b359..af25261ff 100644 --- a/shader/lighting/cap.vert +++ b/shader/lighting/cap.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; uniform vec3 lightPos; diff --git a/shader/lighting/capTest.geom b/shader/lighting/capTest.geom index d14eee6b7..65e88db21 100644 --- a/shader/lighting/capTest.geom +++ b/shader/lighting/capTest.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core // an attempt to test whether a geometry surface occludes the camera from a // light source layout (triangles) in; diff --git a/shader/lighting/floor.frag b/shader/lighting/floor.frag index 85cb88c37..69d9933b5 100644 --- a/shader/lighting/floor.frag +++ b/shader/lighting/floor.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in float lum; in vec2 dField; out vec4 fColor; diff --git a/shader/lighting/floor.geom b/shader/lighting/floor.geom index 38cc4ef1b..ca3ce5aa0 100644 --- a/shader/lighting/floor.geom +++ b/shader/lighting/floor.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/lighting/floor.vert b/shader/lighting/floor.vert index 65bedf150..e7955dfe8 100644 --- a/shader/lighting/floor.vert +++ b/shader/lighting/floor.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 position; void main() { diff --git a/shader/lighting/lineShadow.frag b/shader/lighting/lineShadow.frag index 6d2cc74fc..e23c1116d 100644 --- a/shader/lighting/lineShadow.frag +++ b/shader/lighting/lineShadow.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core out vec4 fColor; void main() { diff --git a/shader/lighting/lineShadow.geom b/shader/lighting/lineShadow.geom index c62ec7284..9ac73d296 100644 --- a/shader/lighting/lineShadow.geom +++ b/shader/lighting/lineShadow.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (lines_adjacency) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/lighting/lineShadow.vert b/shader/lighting/lineShadow.vert index f9d280db5..42d10dba1 100644 --- a/shader/lighting/lineShadow.vert +++ b/shader/lighting/lineShadow.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; void main() { diff --git a/shader/lighting/surface.frag b/shader/lighting/surface.frag index b31c4efa9..8f9e71786 100644 --- a/shader/lighting/surface.frag +++ b/shader/lighting/surface.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec3 lum; in vec3 dField; out vec4 fColor; diff --git a/shader/lighting/surface.vert b/shader/lighting/surface.vert index 734d8eb58..c2c019e1e 100644 --- a/shader/lighting/surface.vert +++ b/shader/lighting/surface.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; uniform vec3 lightPos; diff --git a/shader/lighting/surfaceCap.vert b/shader/lighting/surfaceCap.vert index 734d8eb58..c2c019e1e 100644 --- a/shader/lighting/surfaceCap.vert +++ b/shader/lighting/surfaceCap.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; uniform vec3 lightPos; diff --git a/shader/lighting/texture.frag b/shader/lighting/texture.frag index a9c8964cf..02a39c23d 100644 --- a/shader/lighting/texture.frag +++ b/shader/lighting/texture.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core uniform vec3 lightPos; uniform vec4 lumRad; uniform sampler2D screenTexture; diff --git a/shader/lighting/texture.vert b/shader/lighting/texture.vert index dc9e41d80..51ba3304d 100644 --- a/shader/lighting/texture.vert +++ b/shader/lighting/texture.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 texPos; out vec2 vTexPos; diff --git a/shader/lighting/wall.frag b/shader/lighting/wall.frag index b31c4efa9..8f9e71786 100644 --- a/shader/lighting/wall.frag +++ b/shader/lighting/wall.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec3 lum; in vec3 dField; out vec4 fColor; diff --git a/shader/lighting/wall.geom b/shader/lighting/wall.geom index 36311331c..bd617ebbc 100644 --- a/shader/lighting/wall.geom +++ b/shader/lighting/wall.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/lighting/wall.vert b/shader/lighting/wall.vert index 6e6f93483..ffb827dbb 100644 --- a/shader/lighting/wall.vert +++ b/shader/lighting/wall.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 poss; void main() { diff --git a/shader/lighting/wallShadow.frag b/shader/lighting/wallShadow.frag index a75b09b2a..9d29883a6 100644 --- a/shader/lighting/wallShadow.frag +++ b/shader/lighting/wallShadow.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core out vec4 fColor; void main() { diff --git a/shader/lighting/wallShadow.geom b/shader/lighting/wallShadow.geom index 3b563dbf1..c1ac9a941 100644 --- a/shader/lighting/wallShadow.geom +++ b/shader/lighting/wallShadow.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 8) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/lighting/wallShadow.vert b/shader/lighting/wallShadow.vert index 6e6f93483..ffb827dbb 100644 --- a/shader/lighting/wallShadow.vert +++ b/shader/lighting/wallShadow.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 poss; void main() { diff --git a/shader/posTwoD/arc.frag b/shader/posTwoD/arc.frag index 3119d572c..1271e5fb1 100644 --- a/shader/posTwoD/arc.frag +++ b/shader/posTwoD/arc.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; in vec3 vparams; diff --git a/shader/posTwoD/arc.geom b/shader/posTwoD/arc.geom index ad9ab75d8..9105ac476 100644 --- a/shader/posTwoD/arc.geom +++ b/shader/posTwoD/arc.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/posTwoD/arc.vert b/shader/posTwoD/arc.vert index cd30492ac..5160f6655 100644 --- a/shader/posTwoD/arc.vert +++ b/shader/posTwoD/arc.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in vec3 boxXboxYwidth; diff --git a/shader/posTwoD/basic.frag b/shader/posTwoD/basic.frag index aedc197fd..91ce35a7a 100644 --- a/shader/posTwoD/basic.frag +++ b/shader/posTwoD/basic.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; out vec4 fColor; void main() diff --git a/shader/posTwoD/basic.vert b/shader/posTwoD/basic.vert index 47ab24a9d..9289eceee 100644 --- a/shader/posTwoD/basic.vert +++ b/shader/posTwoD/basic.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; out vec4 vColor; diff --git a/shader/posTwoD/basicTweakZ.frag b/shader/posTwoD/basicTweakZ.frag index aedc197fd..91ce35a7a 100644 --- a/shader/posTwoD/basicTweakZ.frag +++ b/shader/posTwoD/basicTweakZ.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; out vec4 fColor; void main() diff --git a/shader/posTwoD/basicTweakZ.vert b/shader/posTwoD/basicTweakZ.vert index b371bf9d4..b0d2a5fab 100644 --- a/shader/posTwoD/basicTweakZ.vert +++ b/shader/posTwoD/basicTweakZ.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 position; layout (location = 1) in vec4 color; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/posTwoD/bezierQuad.frag b/shader/posTwoD/bezierQuad.frag index f0ee9d08e..0fa45da2a 100644 --- a/shader/posTwoD/bezierQuad.frag +++ b/shader/posTwoD/bezierQuad.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; in vec2 boxOut; in vec2 boxIn; diff --git a/shader/posTwoD/bezierQuad.geom b/shader/posTwoD/bezierQuad.geom index 49b526cf3..08192de52 100644 --- a/shader/posTwoD/bezierQuad.geom +++ b/shader/posTwoD/bezierQuad.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 5) out; in vec4 vColor[]; diff --git a/shader/posTwoD/bezierQuad.vert b/shader/posTwoD/bezierQuad.vert index efa5da739..140be3f3d 100644 --- a/shader/posTwoD/bezierQuad.vert +++ b/shader/posTwoD/bezierQuad.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in vec4 boxes; diff --git a/shader/posTwoD/character.frag b/shader/posTwoD/character.frag index 5f5e495d4..9ca1934e1 100644 --- a/shader/posTwoD/character.frag +++ b/shader/posTwoD/character.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core out vec4 FragColor; in vec4 gColor; diff --git a/shader/posTwoD/character.geom b/shader/posTwoD/character.geom index b9216385c..790b13808 100644 --- a/shader/posTwoD/character.geom +++ b/shader/posTwoD/character.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/posTwoD/character.vert b/shader/posTwoD/character.vert index 342ad1acf..6d6fd6d00 100644 --- a/shader/posTwoD/character.vert +++ b/shader/posTwoD/character.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 aPos; layout (location = 1) in vec4 aColor; layout (location = 2) in vec2 aTexCoord; diff --git a/shader/posTwoD/ellipse.frag b/shader/posTwoD/ellipse.frag index 22377dc5e..0f45bbbd2 100644 --- a/shader/posTwoD/ellipse.frag +++ b/shader/posTwoD/ellipse.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 gPos; in vec2 gBoundingBox; diff --git a/shader/posTwoD/ellipse.geom b/shader/posTwoD/ellipse.geom index 78f2de1fa..fec0278be 100644 --- a/shader/posTwoD/ellipse.geom +++ b/shader/posTwoD/ellipse.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/posTwoD/ellipse.vert b/shader/posTwoD/ellipse.vert index 79ad2fafe..27006c7de 100644 --- a/shader/posTwoD/ellipse.vert +++ b/shader/posTwoD/ellipse.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; void main() { diff --git a/shader/texture/array.frag b/shader/texture/array.frag index 5284df547..1eeb7a45c 100644 --- a/shader/texture/array.frag +++ b/shader/texture/array.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec3 vTexPos; out vec4 fColor; uniform sampler2DArray tilesetSampler; diff --git a/shader/texture/array.vert b/shader/texture/array.vert index 40cd50f76..eb7c9b1c8 100644 --- a/shader/texture/array.vert +++ b/shader/texture/array.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec3 texPos; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/texture/arrayPos.frag b/shader/texture/arrayPos.frag index 703d9e112..5a1cba671 100644 --- a/shader/texture/arrayPos.frag +++ b/shader/texture/arrayPos.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec3 vTexPos; in vec3 vPos; layout (location=0) out vec4 fCol; diff --git a/shader/texture/arrayPos.vert b/shader/texture/arrayPos.vert index a08a96868..511ce08fa 100644 --- a/shader/texture/arrayPos.vert +++ b/shader/texture/arrayPos.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec3 texPos; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/texture/barrel.frag b/shader/texture/barrel.frag index 8e675c4d8..775ba804f 100644 --- a/shader/texture/barrel.frag +++ b/shader/texture/barrel.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 texPos; in vec2 texDist; in float gfactor; diff --git a/shader/texture/barrel.geom b/shader/texture/barrel.geom index 2d69651ca..eec8ae7ac 100644 --- a/shader/texture/barrel.geom +++ b/shader/texture/barrel.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec2 vRad1[]; diff --git a/shader/texture/barrel.vert b/shader/texture/barrel.vert index be8d62ef3..f221b1430 100644 --- a/shader/texture/barrel.vert +++ b/shader/texture/barrel.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 rad1; layout (location = 2) in vec2 rad2; diff --git a/shader/texture/bloomBlur.frag b/shader/texture/bloomBlur.frag index f006a6a45..d5253b838 100644 --- a/shader/texture/bloomBlur.frag +++ b/shader/texture/bloomBlur.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; const vec2 winSize = vec2 (300.0,300.0); diff --git a/shader/texture/bloomBlur.vert b/shader/texture/bloomBlur.vert index 9985c6233..09216fb41 100644 --- a/shader/texture/bloomBlur.vert +++ b/shader/texture/bloomBlur.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 texPos; uniform vec2 winSize; diff --git a/shader/texture/boxBlur.frag b/shader/texture/boxBlur.frag index 32e32ee87..a7c786b01 100644 --- a/shader/texture/boxBlur.frag +++ b/shader/texture/boxBlur.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/texture/boxBlur.vert b/shader/texture/boxBlur.vert index dc9e41d80..51ba3304d 100644 --- a/shader/texture/boxBlur.vert +++ b/shader/texture/boxBlur.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 texPos; out vec2 vTexPos; diff --git a/shader/texture/colorBlur.frag b/shader/texture/colorBlur.frag index 5de6ac6da..63699cbc1 100644 --- a/shader/texture/colorBlur.frag +++ b/shader/texture/colorBlur.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/texture/colorBlur.vert b/shader/texture/colorBlur.vert index dc9e41d80..51ba3304d 100644 --- a/shader/texture/colorBlur.vert +++ b/shader/texture/colorBlur.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 texPos; out vec2 vTexPos; diff --git a/shader/texture/grayscale.frag b/shader/texture/grayscale.frag index bad9af697..f66e03f17 100644 --- a/shader/texture/grayscale.frag +++ b/shader/texture/grayscale.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/texture/grayscale.vert b/shader/texture/grayscale.vert index dc9e41d80..51ba3304d 100644 --- a/shader/texture/grayscale.vert +++ b/shader/texture/grayscale.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 texPos; out vec2 vTexPos; diff --git a/shader/texture/simple.frag b/shader/texture/simple.frag index 13310a7cb..2ed3455a4 100644 --- a/shader/texture/simple.frag +++ b/shader/texture/simple.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/texture/simple.vert b/shader/texture/simple.vert index dc9e41d80..51ba3304d 100644 --- a/shader/texture/simple.vert +++ b/shader/texture/simple.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec2 pos; layout (location = 1) in vec2 texPos; out vec2 vTexPos; diff --git a/shader/texture/simpleWorld.frag b/shader/texture/simpleWorld.frag index 7270697d7..990743b98 100644 --- a/shader/texture/simpleWorld.frag +++ b/shader/texture/simpleWorld.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec2 vTexPos; out vec4 fColor; diff --git a/shader/texture/simpleWorld.vert b/shader/texture/simpleWorld.vert index 34a1bdaa6..199e7df9c 100644 --- a/shader/texture/simpleWorld.vert +++ b/shader/texture/simpleWorld.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 pos; layout (location = 1) in vec2 texPos; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/twoD/arc.frag b/shader/twoD/arc.frag index 3119d572c..1271e5fb1 100644 --- a/shader/twoD/arc.frag +++ b/shader/twoD/arc.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; in vec3 vparams; diff --git a/shader/twoD/arc.geom b/shader/twoD/arc.geom index ad9ab75d8..9105ac476 100644 --- a/shader/twoD/arc.geom +++ b/shader/twoD/arc.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/twoD/arc.vert b/shader/twoD/arc.vert index cd30492ac..5160f6655 100644 --- a/shader/twoD/arc.vert +++ b/shader/twoD/arc.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in vec3 boxXboxYwidth; diff --git a/shader/twoD/basic.frag b/shader/twoD/basic.frag index aedc197fd..91ce35a7a 100644 --- a/shader/twoD/basic.frag +++ b/shader/twoD/basic.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; out vec4 fColor; void main() diff --git a/shader/twoD/basic.vert b/shader/twoD/basic.vert index 16472176c..566ca5aa7 100644 --- a/shader/twoD/basic.vert +++ b/shader/twoD/basic.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/twoD/basicTweakZ.frag b/shader/twoD/basicTweakZ.frag index aedc197fd..91ce35a7a 100644 --- a/shader/twoD/basicTweakZ.frag +++ b/shader/twoD/basicTweakZ.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; out vec4 fColor; void main() diff --git a/shader/twoD/basicTweakZ.vert b/shader/twoD/basicTweakZ.vert index b371bf9d4..b0d2a5fab 100644 --- a/shader/twoD/basicTweakZ.vert +++ b/shader/twoD/basicTweakZ.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 position; layout (location = 1) in vec4 color; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/twoD/bezierQuad.frag b/shader/twoD/bezierQuad.frag index f0ee9d08e..0fa45da2a 100644 --- a/shader/twoD/bezierQuad.frag +++ b/shader/twoD/bezierQuad.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 vColor; in vec2 boxOut; in vec2 boxIn; diff --git a/shader/twoD/bezierQuad.geom b/shader/twoD/bezierQuad.geom index 49b526cf3..08192de52 100644 --- a/shader/twoD/bezierQuad.geom +++ b/shader/twoD/bezierQuad.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 5) out; in vec4 vColor[]; diff --git a/shader/twoD/bezierQuad.vert b/shader/twoD/bezierQuad.vert index efa5da739..140be3f3d 100644 --- a/shader/twoD/bezierQuad.vert +++ b/shader/twoD/bezierQuad.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 color; layout (location = 2) in vec4 boxes; diff --git a/shader/twoD/character.frag b/shader/twoD/character.frag index 5f5e495d4..9ca1934e1 100644 --- a/shader/twoD/character.frag +++ b/shader/twoD/character.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core out vec4 FragColor; in vec4 gColor; diff --git a/shader/twoD/character.geom b/shader/twoD/character.geom index b9216385c..790b13808 100644 --- a/shader/twoD/character.geom +++ b/shader/twoD/character.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vColor []; diff --git a/shader/twoD/character.vert b/shader/twoD/character.vert index 342ad1acf..6d6fd6d00 100644 --- a/shader/twoD/character.vert +++ b/shader/twoD/character.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 aPos; layout (location = 1) in vec4 aColor; layout (location = 2) in vec2 aTexCoord; diff --git a/shader/twoD/ellipse.frag b/shader/twoD/ellipse.frag index 5bd7df636..8bc656873 100644 --- a/shader/twoD/ellipse.frag +++ b/shader/twoD/ellipse.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core in vec4 gColorC; in vec4 gColorE; in vec2 gBoundingBox; diff --git a/shader/twoD/ellipse.geom b/shader/twoD/ellipse.geom index 602c0058d..2dab384ac 100644 --- a/shader/twoD/ellipse.geom +++ b/shader/twoD/ellipse.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (triangles) in; layout (triangle_strip, max_vertices = 4) out; in vec4 vCol[]; diff --git a/shader/twoD/ellipse.vert b/shader/twoD/ellipse.vert index 4335e3588..9c9d4531a 100644 --- a/shader/twoD/ellipse.vert +++ b/shader/twoD/ellipse.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec3 position; layout (location = 1) in vec4 col; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/wall/blank.frag b/shader/wall/blank.frag index 3f9f20b98..784ee8d94 100644 --- a/shader/wall/blank.frag +++ b/shader/wall/blank.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location=0) out vec4 fCol; layout (location=1) out vec4 fPos; in vec4 gColor; diff --git a/shader/wall/blank.geom b/shader/wall/blank.geom index e6adec26b..9495a6d1e 100644 --- a/shader/wall/blank.geom +++ b/shader/wall/blank.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/wall/blank.vert b/shader/wall/blank.vert index 052c35659..3e9883240 100644 --- a/shader/wall/blank.vert +++ b/shader/wall/blank.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 poss; layout (location = 1) in vec4 color; out vec4 vColor; diff --git a/shader/wall/texture.frag b/shader/wall/texture.frag index c0589ebb9..7b0b7dfbe 100644 --- a/shader/wall/texture.frag +++ b/shader/wall/texture.frag @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location=0) out vec4 fCol; layout (location=1) out vec4 fPos; in vec2 tPos; diff --git a/shader/wall/texture.geom b/shader/wall/texture.geom index badbeb710..7d8e93c8f 100644 --- a/shader/wall/texture.geom +++ b/shader/wall/texture.geom @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (points) in; layout (triangle_strip, max_vertices = 4) out; layout (std140, binding = 0) uniform TheMat { mat4 theMat; } ; diff --git a/shader/wall/texture.vert b/shader/wall/texture.vert index 052c35659..3e9883240 100644 --- a/shader/wall/texture.vert +++ b/shader/wall/texture.vert @@ -1,4 +1,4 @@ -#version 430 core +#version 450 core layout (location = 0) in vec4 poss; layout (location = 1) in vec4 color; out vec4 vColor;