[Bf-blender-cvs] [b47e10c4c75] greasepencil-object: Remove old opengl code in shaders

[Antonio Vazquez]

Commit: b47e10c4c75d46dd197a9af3e06b8ce6f05a727b
Author: Antonio Vazquez
Date:   Wed May 17 10:25:12 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb47e10c4c75d46dd197a9af3e06b8ce6f05a727b

Remove old opengl code in shaders

===================================================================

M	source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl
M	source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
M	source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
M	source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
M	source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl

===================================================================

diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl
index 54b339d32ba..c6336210439 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_fill_vert.glsl
@@ -1,18 +1,10 @@
 uniform mat4 ModelViewProjectionMatrix;
 
-#if __VERSION__ == 120
-	attribute vec3 pos;
-	attribute vec4 color;
-	attribute vec2 texCoord;
-	varying vec4 finalColor;
-	varying vec2 texCoord_interp;
-#else
-	in vec3 pos;
-	in vec4 color;
-	in vec2 texCoord;
-	out vec4 finalColor;
-	out vec2 texCoord_interp;
-#endif
+in vec3 pos;
+in vec4 color;
+in vec2 texCoord;
+out vec4 finalColor;
+out vec2 texCoord_interp;
 	
 void main(void)
 {
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
index 26bc1988b32..d94cec13474 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
@@ -1,13 +1,6 @@
-#if __VERSION__ == 120
-	varying vec4 mColor;
-	varying vec2 mTexCoord;
-	#define fragColor gl_FragColor
-#else
-	in vec4 mColor;
-	in vec2 mTexCoord;
-	out vec4 fragColor;
-#endif
-
+in vec4 mColor;
+in vec2 mTexCoord;
+out vec4 fragColor;
 
 void main()
 {
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
index 6e1a65f055b..f23a132c568 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_fill_frag.glsl
@@ -25,14 +25,9 @@ uniform sampler2D myTexture;
 #define CHESS 3
 #define TEXTURE 4
 
-#if __VERSION__ == 120
-	varying vec2 texCoord_interp;
-	#define fragColor gl_FragColor
-#else
-	in vec2 texCoord_interp;
-	out vec4 fragColor;
-	#define texture2D texture
-#endif
+in vec2 texCoord_interp;
+out vec4 fragColor;
+#define texture2D texture
 
 void set_color(in vec4 color, in vec4 color2, in vec4 tcolor, in float mixv, in float factor, 
 			   in int tmix, in int flip, out vec4 ocolor)
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl
index 025925a0346..bb9fcf6479c 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_fill_vert.glsl
@@ -1,14 +1,8 @@
 uniform mat4 ModelViewProjectionMatrix;
 
-#if __VERSION__ == 120
-	attribute vec3 pos;
-	attribute vec2 texCoord;
-	varying vec2 texCoord_interp;
-#else
-	in vec3 pos;
-	in vec2 texCoord;
-	out vec2 texCoord_interp;
-#endif
+in vec3 pos;
+in vec2 texCoord;
+out vec2 texCoord_interp;
 	
 void main(void)
 {
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
index 26bc1988b32..d94cec13474 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_frag.glsl
@@ -1,13 +1,6 @@
-#if __VERSION__ == 120
-	varying vec4 mColor;
-	varying vec2 mTexCoord;
-	#define fragColor gl_FragColor
-#else
-	in vec4 mColor;
-	in vec2 mTexCoord;
-	out vec4 fragColor;
-#endif
-
+in vec4 mColor;
+in vec2 mTexCoord;
+out vec4 fragColor;
 
 void main()
 {
diff --git a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
index feabda2b3a5..d47a7ff8821 100644
--- a/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_gpencil_stroke_vert.glsl
@@ -1,19 +1,11 @@
 uniform mat4 ModelViewProjectionMatrix;
 
-#if __VERSION__ == 120
-	attribute vec3 pos;
-	attribute vec4 color;
-	attribute float thickness;
+in vec3 pos;
+in vec4 color;
+in float thickness;
 
-	varying vec4 finalColor;
-#else
-	in vec3 pos;
-	in vec4 color;
-	in float thickness;
-
-  out vec4 finalColor;
-  out float finalThickness;
-#endif
+out vec4 finalColor;
+out float finalThickness;
 	
 void main(void)
 {