From b3576fea5259def235a79b77363f4ad626592cd7 Mon Sep 17 00:00:00 2001 From: Anselme Date: Sat, 20 Feb 2016 14:22:34 +0100 Subject: [PATCH] removed all the #version 330 core lines in shader --- shaders/bloom.frag.glsl | 2 -- shaders/blur.frag.glsl | 2 -- shaders/forward.frag.glsl | 2 -- shaders/forward.vert.glsl | 2 -- shaders/gbuffer.frag.glsl | 1 - shaders/gbuffer.vert.glsl | 2 -- shaders/hdr.frag.glsl | 2 -- shaders/luminance.frag.glsl | 2 -- shaders/reduction.frag.glsl | 2 -- src/light.cpp | 6 ++---- src/posteffectmodule.cpp | 3 +-- src/skyboxmodule.cpp | 6 ++---- 12 files changed, 5 insertions(+), 27 deletions(-) diff --git a/shaders/bloom.frag.glsl b/shaders/bloom.frag.glsl index f53f4aa..2c1604a 100644 --- a/shaders/bloom.frag.glsl +++ b/shaders/bloom.frag.glsl @@ -1,5 +1,3 @@ -#version 330 core - uniform sampler2DRect colorSampler; uniform sampler2DRect blurSampler0; uniform sampler2DRect blurSampler1; diff --git a/shaders/blur.frag.glsl b/shaders/blur.frag.glsl index cec3375..74f6802 100644 --- a/shaders/blur.frag.glsl +++ b/shaders/blur.frag.glsl @@ -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 diff --git a/shaders/forward.frag.glsl b/shaders/forward.frag.glsl index 1bcc454..f795f3b 100644 --- a/shaders/forward.frag.glsl +++ b/shaders/forward.frag.glsl @@ -1,5 +1,3 @@ -#version 330 core - uniform vec3 lightColor; uniform float materialNs; diff --git a/shaders/forward.vert.glsl b/shaders/forward.vert.glsl index 86b2618..aebb2de 100644 --- a/shaders/forward.vert.glsl +++ b/shaders/forward.vert.glsl @@ -1,5 +1,3 @@ -#version 330 core - uniform mat4 modelViewMatrix; uniform mat4 MVP; uniform mat4 viewMatrix; diff --git a/shaders/gbuffer.frag.glsl b/shaders/gbuffer.frag.glsl index 4260fe9..b406912 100644 --- a/shaders/gbuffer.frag.glsl +++ b/shaders/gbuffer.frag.glsl @@ -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; diff --git a/shaders/gbuffer.vert.glsl b/shaders/gbuffer.vert.glsl index 56fe2c9..d2616e4 100644 --- a/shaders/gbuffer.vert.glsl +++ b/shaders/gbuffer.vert.glsl @@ -1,5 +1,3 @@ -#version 330 core - #ifdef NORMAL_MAP out mat3 tangentSpace; #else diff --git a/shaders/hdr.frag.glsl b/shaders/hdr.frag.glsl index 0377c20..b31442c 100644 --- a/shaders/hdr.frag.glsl +++ b/shaders/hdr.frag.glsl @@ -1,5 +1,3 @@ -#version 330 core - uniform sampler2DRect colorSampler; uniform vec3 minMaxMean; diff --git a/shaders/luminance.frag.glsl b/shaders/luminance.frag.glsl index afcece6..90e2fc0 100644 --- a/shaders/luminance.frag.glsl +++ b/shaders/luminance.frag.glsl @@ -1,5 +1,3 @@ -#version 330 core - uniform sampler2DRect colorSampler; uniform float threshold; diff --git a/shaders/reduction.frag.glsl b/shaders/reduction.frag.glsl index 0852506..3d202f7 100644 --- a/shaders/reduction.frag.glsl +++ b/shaders/reduction.frag.glsl @@ -1,5 +1,3 @@ -#version 330 core - uniform sampler2DRect minMaxMeanSampler; uniform int width; uniform int height; diff --git a/src/light.cpp b/src/light.cpp index 19d6fd3..0b1b506 100644 --- a/src/light.cpp +++ b/src/light.cpp @@ -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\ diff --git a/src/posteffectmodule.cpp b/src/posteffectmodule.cpp index 6afa826..2802a71 100644 --- a/src/posteffectmodule.cpp +++ b/src/posteffectmodule.cpp @@ -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"; diff --git a/src/skyboxmodule.cpp b/src/skyboxmodule.cpp index 8f1c6eb..0c422e7 100644 --- a/src/skyboxmodule.cpp +++ b/src/skyboxmodule.cpp @@ -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\