removed all the #version 330 core lines in shader

This commit is contained in:
Anselme 2016-02-20 14:22:34 +01:00
parent d2df3a998f
commit b3576fea52
12 changed files with 5 additions and 27 deletions

View File

@ -1,5 +1,3 @@
#version 330 core
uniform sampler2DRect colorSampler;
uniform sampler2DRect blurSampler0;
uniform sampler2DRect blurSampler1;

View File

@ -1,5 +1,3 @@
#version 330 core
// linear sampling gaussian blur (kernel size : 9)
// from http://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling

View File

@ -1,5 +1,3 @@
#version 330 core
uniform vec3 lightColor;
uniform float materialNs;

View File

@ -1,5 +1,3 @@
#version 330 core
uniform mat4 modelViewMatrix;
uniform mat4 MVP;
uniform mat4 viewMatrix;

View File

@ -1,4 +1,3 @@
#version 330 core
layout (location = 0) out vec3 outNormal;
layout (location = 1) out vec4 outColor;
layout (location = 2) out vec4 outSpecular;

View File

@ -1,5 +1,3 @@
#version 330 core
#ifdef NORMAL_MAP
out mat3 tangentSpace;
#else

View File

@ -1,5 +1,3 @@
#version 330 core
uniform sampler2DRect colorSampler;
uniform vec3 minMaxMean;

View File

@ -1,5 +1,3 @@
#version 330 core
uniform sampler2DRect colorSampler;
uniform float threshold;

View File

@ -1,5 +1,3 @@
#version 330 core
uniform sampler2DRect minMaxMeanSampler;
uniform int width;
uniform int height;

View File

@ -171,8 +171,7 @@ unsigned int Light::getFlags(Light* l)
}
const char* Light::vertSource =
"#version 330 core\n\
layout(location = 0)in vec3 inPosition;\n\
"layout(location = 0)in vec3 inPosition;\n\
#ifdef ALPHA_MASK\n\
layout(location = 2)in vec2 inTexCoord;\n\
out vec3 varTexCoord;\n\
@ -187,8 +186,7 @@ const char* Light::vertSource =
}\n";
const char* Light::fragSource =
"#version 330 core\n\
#ifdef ALPHA_MASK\n\
"#ifdef ALPHA_MASK\n\
uniform sampler2D alphaMask;\n\
in vec3 varTexCoord;\n\
#endif\n\

View File

@ -218,8 +218,7 @@ void PostEffectModule::setShaders(const std::string &luminanceFragSource,
}
const std::string PostEffectModule::vertSource =
"#version 330 core\n\
layout(location = 0)in vec2 inPosition;\n\
"layout(location = 0)in vec2 inPosition;\n\
void main(void) {\n\
gl_Position = vec4(inPosition, 0.0, 1.0);\n\
}\n";

View File

@ -129,8 +129,7 @@ const GLubyte SkyboxModule::skyboxIndices[] = {
};
const std::string SkyboxModule::vertSource =
"#version 330 core\n\
layout(location = 0)in vec3 inPosition;\n\
"layout(location = 0)in vec3 inPosition;\n\
out vec3 varTexCoord;\n\
uniform mat4 MVP;\n\
void main()\n\
@ -140,8 +139,7 @@ const std::string SkyboxModule::vertSource =
}\n";
const std::string SkyboxModule::fragSource =
"#version 330 core\n\
in vec3 varTexCoord;\n\
"in vec3 varTexCoord;\n\
out vec4 outColor;\n\
uniform samplerCube skybox;\n\
void main()\n\