Kaydet (Commit) 653ace96 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

make sure that all shaders contain a version string

This is necessary for OSX where we are using a core context that does
not implement any legacy features anymore.

Change-Id: I59536e99761691d910fef62cf82ceb03e57725ae
üst 4dbd58ab
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
varying vec4 fragmentColor;
void main()
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vPosition;
uniform mat4 MVP;
attribute vec4 vColor;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
varying vec4 fragmentColor;
void main()
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vPosition;
uniform mat4 MVP;
uniform vec4 vColor;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
varying vec4 fragmentColor;
void main()
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vPosition;
uniform vec4 vColor;
varying vec4 fragmentColor;
......
......@@ -6,6 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
uniform float minCoordX;
varying vec3 positionWorldspace;
varying vec4 fragmentColor;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vPosition;
uniform mat4 MVP;
uniform mat4 M;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
uniform sampler2D RenderTex;
varying vec2 vTexCoord;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec4 vPosition;
attribute vec2 texCoord;
varying vec2 vTexCoord;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
varying vec2 vTexCoord;
uniform sampler2D TextTex;
uniform vec4 textColor;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vPosition;
attribute vec2 texCoord;
varying vec2 vTexCoord;
......
......@@ -6,6 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 330 core
#define MAX_LIGHT_NUM 8
......
......@@ -6,6 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 330 core
#define MAX_LIGHT_NUM 8
......
......@@ -6,6 +6,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 330 core
#define MAX_LIGHT_NUM 8
......
......@@ -6,6 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
#define MAX_LIGHT_NUM 8
varying vec3 positionWorldspace;
......
......@@ -6,7 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 330 core
in vec3 vertexPositionModelspace;
in vec3 vertexNormalModelspace;
......
......@@ -6,7 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 330 core
in vec3 vertexPositionModelspace;
in vec3 vertexNormalModelspace;
in mat4 M;
......
......@@ -6,7 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 330 core
in vec3 vertexPositionModelspace;
in vec3 vertexNormalModelspace;
in mat4 M;
......
......@@ -6,6 +6,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vertexPositionModelspace;
attribute vec3 vertexNormalModelspace;
......
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 120
#version 130
varying vec4 fragmentColor;
uniform int shape;
......
......@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 120
#version 130
attribute vec3 vPosition;
uniform mat4 MVP;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
uniform sampler2D TextTex;
varying vec2 vTexCoord;
void main()
......
......@@ -8,6 +8,7 @@
*/
#version 330 core
#extension GL_EXT_texture_array : enable
uniform sampler2DArray texArray;
......
......@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#version 130
attribute vec3 vPosition;
uniform mat4 MVP;
attribute vec2 texCoord;
......
......@@ -8,6 +8,7 @@
*/
#version 330 core
in vec3 vPosition;
in vec3 texCoord;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment