summaryrefslogtreecommitdiff
path: root/chart2/opengl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-08-15 06:14:51 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-09-02 01:08:42 +0200
commitfbddfdecccb9411ec40bb9d89f6bf8ed86cd423f (patch)
treeac16a7f6f6a022bdc6c9187cd571643c494a7390 /chart2/opengl
parent653ace96c6974cd17ec27252dfdb17d8de40d4d9 (diff)
we need to switch to OpenGL 3.2 core for OSX
A 3.2 core context only supports GLSL 150 core and above. This at least removes all vompile errors related to missing or wrong version requirements. In a next step we need to make use of modern GLSL features now. Change-Id: I59f1bc84ab4f64cc6520309b7da25adc3e116997
Diffstat (limited to 'chart2/opengl')
-rw-r--r--chart2/opengl/backgroundFragmentShader.glsl2
-rw-r--r--chart2/opengl/backgroundVertexShader.glsl2
-rw-r--r--chart2/opengl/commonFragmentShader.glsl2
-rw-r--r--chart2/opengl/commonVertexShader.glsl2
-rw-r--r--chart2/opengl/debugFragmentShader.glsl2
-rw-r--r--chart2/opengl/debugVertexShader.glsl2
-rw-r--r--chart2/opengl/pickingFragmentShader.glsl2
-rw-r--r--chart2/opengl/pickingVertexShader.glsl2
-rw-r--r--chart2/opengl/renderTextureFragmentShader.glsl2
-rw-r--r--chart2/opengl/renderTextureVertexShader.glsl2
-rw-r--r--chart2/opengl/screenTextFragmentShader.glsl2
-rw-r--r--chart2/opengl/screenTextVertexShader.glsl2
-rw-r--r--chart2/opengl/shape3DFragmentShaderV300.glsl2
-rw-r--r--chart2/opengl/shape3DVertexShaderV300.glsl2
-rw-r--r--chart2/opengl/symbolFragmentShader.glsl2
-rw-r--r--chart2/opengl/symbolVertexShader.glsl2
-rw-r--r--chart2/opengl/textFragmentShader.glsl2
-rw-r--r--chart2/opengl/textVertexShader.glsl2
18 files changed, 18 insertions, 18 deletions
diff --git a/chart2/opengl/backgroundFragmentShader.glsl b/chart2/opengl/backgroundFragmentShader.glsl
index 424ae31a6882..646dd4fe1633 100644
--- a/chart2/opengl/backgroundFragmentShader.glsl
+++ b/chart2/opengl/backgroundFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core core
varying vec4 fragmentColor;
diff --git a/chart2/opengl/backgroundVertexShader.glsl b/chart2/opengl/backgroundVertexShader.glsl
index 239675cdfa09..3f2ae8efdf49 100644
--- a/chart2/opengl/backgroundVertexShader.glsl
+++ b/chart2/opengl/backgroundVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
uniform mat4 MVP;
diff --git a/chart2/opengl/commonFragmentShader.glsl b/chart2/opengl/commonFragmentShader.glsl
index 424ae31a6882..2f573adf1ef8 100644
--- a/chart2/opengl/commonFragmentShader.glsl
+++ b/chart2/opengl/commonFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
varying vec4 fragmentColor;
diff --git a/chart2/opengl/commonVertexShader.glsl b/chart2/opengl/commonVertexShader.glsl
index efbb8f1f9c27..f48b4d06a355 100644
--- a/chart2/opengl/commonVertexShader.glsl
+++ b/chart2/opengl/commonVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
uniform mat4 MVP;
diff --git a/chart2/opengl/debugFragmentShader.glsl b/chart2/opengl/debugFragmentShader.glsl
index 3366b1507989..d9255eb80a7e 100644
--- a/chart2/opengl/debugFragmentShader.glsl
+++ b/chart2/opengl/debugFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
varying vec4 fragmentColor;
diff --git a/chart2/opengl/debugVertexShader.glsl b/chart2/opengl/debugVertexShader.glsl
index 622727f3c858..1768cc8b2750 100644
--- a/chart2/opengl/debugVertexShader.glsl
+++ b/chart2/opengl/debugVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
uniform vec4 vColor;
diff --git a/chart2/opengl/pickingFragmentShader.glsl b/chart2/opengl/pickingFragmentShader.glsl
index 9d3b7bb71550..749fefce624c 100644
--- a/chart2/opengl/pickingFragmentShader.glsl
+++ b/chart2/opengl/pickingFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
uniform float minCoordX;
varying vec3 positionWorldspace;
diff --git a/chart2/opengl/pickingVertexShader.glsl b/chart2/opengl/pickingVertexShader.glsl
index d751a755dde9..c0096917cb97 100644
--- a/chart2/opengl/pickingVertexShader.glsl
+++ b/chart2/opengl/pickingVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
uniform mat4 MVP;
diff --git a/chart2/opengl/renderTextureFragmentShader.glsl b/chart2/opengl/renderTextureFragmentShader.glsl
index 8029d08edf09..c037456095c7 100644
--- a/chart2/opengl/renderTextureFragmentShader.glsl
+++ b/chart2/opengl/renderTextureFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
uniform sampler2D RenderTex;
varying vec2 vTexCoord;
diff --git a/chart2/opengl/renderTextureVertexShader.glsl b/chart2/opengl/renderTextureVertexShader.glsl
index 43ab1b06d220..80560cfe11fb 100644
--- a/chart2/opengl/renderTextureVertexShader.glsl
+++ b/chart2/opengl/renderTextureVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec4 vPosition;
attribute vec2 texCoord;
diff --git a/chart2/opengl/screenTextFragmentShader.glsl b/chart2/opengl/screenTextFragmentShader.glsl
index e1fb0784641b..b5b69c90aa9f 100644
--- a/chart2/opengl/screenTextFragmentShader.glsl
+++ b/chart2/opengl/screenTextFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
varying vec2 vTexCoord;
uniform sampler2D TextTex;
diff --git a/chart2/opengl/screenTextVertexShader.glsl b/chart2/opengl/screenTextVertexShader.glsl
index 5428875314c7..ab3fb9259172 100644
--- a/chart2/opengl/screenTextVertexShader.glsl
+++ b/chart2/opengl/screenTextVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
attribute vec2 texCoord;
diff --git a/chart2/opengl/shape3DFragmentShaderV300.glsl b/chart2/opengl/shape3DFragmentShaderV300.glsl
index c6888dbf0ba1..c9d4522c6eca 100644
--- a/chart2/opengl/shape3DFragmentShaderV300.glsl
+++ b/chart2/opengl/shape3DFragmentShaderV300.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
#define MAX_LIGHT_NUM 8
diff --git a/chart2/opengl/shape3DVertexShaderV300.glsl b/chart2/opengl/shape3DVertexShaderV300.glsl
index b28d9cce3203..947ee5fde602 100644
--- a/chart2/opengl/shape3DVertexShaderV300.glsl
+++ b/chart2/opengl/shape3DVertexShaderV300.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vertexPositionModelspace;
attribute vec3 vertexNormalModelspace;
diff --git a/chart2/opengl/symbolFragmentShader.glsl b/chart2/opengl/symbolFragmentShader.glsl
index bb3e4dab7831..4b0b464a3622 100644
--- a/chart2/opengl/symbolFragmentShader.glsl
+++ b/chart2/opengl/symbolFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
varying vec4 fragmentColor;
uniform int shape;
diff --git a/chart2/opengl/symbolVertexShader.glsl b/chart2/opengl/symbolVertexShader.glsl
index 0c6617efbd60..7e3a7488daa9 100644
--- a/chart2/opengl/symbolVertexShader.glsl
+++ b/chart2/opengl/symbolVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
uniform mat4 MVP;
diff --git a/chart2/opengl/textFragmentShader.glsl b/chart2/opengl/textFragmentShader.glsl
index 80ae00ac6f02..4f582a4117fb 100644
--- a/chart2/opengl/textFragmentShader.glsl
+++ b/chart2/opengl/textFragmentShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
uniform sampler2D TextTex;
varying vec2 vTexCoord;
diff --git a/chart2/opengl/textVertexShader.glsl b/chart2/opengl/textVertexShader.glsl
index c76223b31e22..3f14ab96800c 100644
--- a/chart2/opengl/textVertexShader.glsl
+++ b/chart2/opengl/textVertexShader.glsl
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#version 130
+#version 150 core
attribute vec3 vPosition;
uniform mat4 MVP;