diff --git a/ext/ghoul b/ext/ghoul index 0eba3e297c..6912875aaa 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 0eba3e297cbff1afec1faa71cd8836632802cba2 +Subproject commit 6912875aaab3087a71fe319e558f947739c5b9b2 diff --git a/shaders/ABuffer/abufferResolveFragment.glsl b/shaders/ABuffer/abufferResolveFragment.glsl index 6ca9a6774e..c7f1bd3faa 100644 --- a/shaders/ABuffer/abufferResolveFragment.glsl +++ b/shaders/ABuffer/abufferResolveFragment.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + // ================================================================================ // Settings // ================================================================================ diff --git a/shaders/ABuffer/abufferResolveVertex.glsl b/shaders/ABuffer/abufferResolveVertex.glsl index 2f25d2c387..354fef316c 100644 --- a/shaders/ABuffer/abufferResolveVertex.glsl +++ b/shaders/ABuffer/abufferResolveVertex.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + in vec4 position; out vec2 texCoord; diff --git a/shaders/cubeFrag.glsl b/shaders/cubeFrag.glsl index 2684d4647d..876035e2c9 100644 --- a/shaders/cubeFrag.glsl +++ b/shaders/cubeFrag.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + in vec4 color; out vec4 outputColor; diff --git a/shaders/cubeVert.glsl b/shaders/cubeVert.glsl index 1f320523ce..b240159d65 100644 --- a/shaders/cubeVert.glsl +++ b/shaders/cubeVert.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 projectionMatrix; uniform mat4 viewMatrix; uniform mat4 modelMatrix; diff --git a/shaders/ephemeris_fs.glsl b/shaders/ephemeris_fs.glsl index 8c53fa782c..61631f3e77 100644 --- a/shaders/ephemeris_fs.glsl +++ b/shaders/ephemeris_fs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; diff --git a/shaders/ephemeris_vs.glsl b/shaders/ephemeris_vs.glsl index a116c0d617..2f777b8528 100644 --- a/shaders/ephemeris_vs.glsl +++ b/shaders/ephemeris_vs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; //uniform vec4 etColor; diff --git a/shaders/exitpoints.frag b/shaders/exitpoints.frag index 80456e8e73..ac8f780f5f 100644 --- a/shaders/exitpoints.frag +++ b/shaders/exitpoints.frag @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform int volumeType; in vec3 vPosition; diff --git a/shaders/exitpoints.vert b/shaders/exitpoints.vert index ceadc97ab8..1d63c3d2c5 100644 --- a/shaders/exitpoints.vert +++ b/shaders/exitpoints.vert @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + layout(location = 0) in vec4 vertPosition; uniform mat4 modelViewProjection; diff --git a/shaders/grid_fs.glsl b/shaders/grid_fs.glsl index 5fc0bc44d8..b0f572056d 100644 --- a/shaders/grid_fs.glsl +++ b/shaders/grid_fs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; uniform vec4 gridColor; diff --git a/shaders/grid_vs.glsl b/shaders/grid_vs.glsl index 26777b8744..521d167fc7 100644 --- a/shaders/grid_vs.glsl +++ b/shaders/grid_vs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; uniform vec4 gridColor; diff --git a/shaders/plane_fs.glsl b/shaders/plane_fs.glsl index 364453b464..c3f673f8cf 100644 --- a/shaders/plane_fs.glsl +++ b/shaders/plane_fs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform float time; uniform sampler2D texture1; diff --git a/shaders/plane_vs.glsl b/shaders/plane_vs.glsl index 479fafb41f..1d38eb6b77 100644 --- a/shaders/plane_vs.glsl +++ b/shaders/plane_vs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; diff --git a/shaders/pscstandard_fs.glsl b/shaders/pscstandard_fs.glsl index 32e782c1b9..c1eb075179 100644 --- a/shaders/pscstandard_fs.glsl +++ b/shaders/pscstandard_fs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform vec4 campos; uniform vec4 objpos; //uniform vec3 camdir; // add this for specular diff --git a/shaders/pscstandard_vs.glsl b/shaders/pscstandard_vs.glsl index 0e2da8b2cb..13f3025471 100644 --- a/shaders/pscstandard_vs.glsl +++ b/shaders/pscstandard_vs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; diff --git a/shaders/quadFrag.glsl b/shaders/quadFrag.glsl index 68a291e088..235e8a3afd 100644 --- a/shaders/quadFrag.glsl +++ b/shaders/quadFrag.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform sampler2D quadTex; in vec2 texCoord; out vec4 color; diff --git a/shaders/quadVert.glsl b/shaders/quadVert.glsl index e776f19f4a..80652fae25 100644 --- a/shaders/quadVert.glsl +++ b/shaders/quadVert.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + layout(location = 0) in vec2 texCoordinate; layout(location = 2) in vec3 vertPosition; diff --git a/shaders/quadVertFlare.glsl b/shaders/quadVertFlare.glsl index 1fe6c36ca7..78bcc9c4a4 100644 --- a/shaders/quadVertFlare.glsl +++ b/shaders/quadVertFlare.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + in vec4 position; out vec2 texCoord; diff --git a/shaders/singlepassraycaster.frag b/shaders/singlepassraycaster.frag index 24db870744..92dacbb64e 100644 --- a/shaders/singlepassraycaster.frag +++ b/shaders/singlepassraycaster.frag @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + // Based on http://prideout.net/blog/?p=64 uniform sampler3D texVolume; diff --git a/shaders/singlepassraycaster.gs b/shaders/singlepassraycaster.gs index 843a689f0c..8d5f274293 100644 --- a/shaders/singlepassraycaster.gs +++ b/shaders/singlepassraycaster.gs @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + // Based on http://prideout.net/blog/?p=64 layout(points) in; diff --git a/shaders/singlepassraycaster.vert b/shaders/singlepassraycaster.vert index 1231f0a9c7..f62e2c2a5e 100644 --- a/shaders/singlepassraycaster.vert +++ b/shaders/singlepassraycaster.vert @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + // Based on http://prideout.net/blog/?p=64 layout(location = 0) in vec4 Position; diff --git a/shaders/star_fs.glsl b/shaders/star_fs.glsl index b8567ce8a5..90173882a8 100644 --- a/shaders/star_fs.glsl +++ b/shaders/star_fs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform sampler2D texture1; uniform vec3 Color; diff --git a/shaders/star_fs_points.glsl b/shaders/star_fs_points.glsl index fa920f6129..a1d700e26a 100644 --- a/shaders/star_fs_points.glsl +++ b/shaders/star_fs_points.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform sampler2D texture1; uniform vec3 Color; diff --git a/shaders/star_ge.glsl b/shaders/star_ge.glsl index 27d89c225d..e3cde907cf 100644 --- a/shaders/star_ge.glsl +++ b/shaders/star_ge.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + const vec2 corners[4] = vec2[4]( vec2(0.0, 1.0), vec2(0.0, 0.0), diff --git a/shaders/star_ge_points.glsl b/shaders/star_ge_points.glsl index 4c9014a445..c6180af6d9 100644 --- a/shaders/star_ge_points.glsl +++ b/shaders/star_ge_points.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + layout(points) in; layout(points, max_vertices = 1) out; // Draw points //layout(triangle_strip, max_vertices = 4) out; // Draw quads diff --git a/shaders/star_vs.glsl b/shaders/star_vs.glsl index b8bc1110ad..0ec32410d3 100644 --- a/shaders/star_vs.glsl +++ b/shaders/star_vs.glsl @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; diff --git a/shaders/star_vs_points.glsl b/shaders/star_vs_points.glsl index aecbb86443..915f08c0c4 100644 --- a/shaders/star_vs_points.glsl +++ b/shaders/star_vs_points.glsl @@ -1,4 +1,29 @@ -#version 440 +/***************************************************************************************** + * * + * OpenSpace * + * * + * Copyright (c) 2014 * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this * + * software and associated documentation files (the "Software"), to deal in the Software * + * without restriction, including without limitation the rights to use, copy, modify, * + * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to * + * permit persons to whom the Software is furnished to do so, subject to the following * + * conditions: * + * * + * The above copyright notice and this permission notice shall be included in all copies * + * or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, * + * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A * + * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT * + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF * + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE * + * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + ****************************************************************************************/ + +#version __CONTEXT__ + uniform mat4 ViewProjection; uniform mat4 ModelTransform; uniform vec4 campos; diff --git a/shaders/twopassraycaster.frag b/shaders/twopassraycaster.frag index 372938b27f..8e5c8c482f 100644 --- a/shaders/twopassraycaster.frag +++ b/shaders/twopassraycaster.frag @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + uniform sampler2D texBack, texFront; uniform sampler3D texVolume; uniform float stepSize; diff --git a/shaders/twopassraycaster.vert b/shaders/twopassraycaster.vert index dcd9c547ae..3a33677ff2 100644 --- a/shaders/twopassraycaster.vert +++ b/shaders/twopassraycaster.vert @@ -22,6 +22,8 @@ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * ****************************************************************************************/ +#version __CONTEXT__ + layout(location = 0) in vec2 texCoordinate; layout(location = 2) in vec3 vertPosition;