diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-17 03:46:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-17 03:46:42 +0300 |
commit | 8adec78ca574f09242aa4588ad04f498f1e074aa (patch) | |
tree | 0f0dbfb1d280a160756a9a4d55fe123bb3ba36e6 /source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl | |
parent | c8bf3984ee806cd035c47aa5d7f99828f5667dd7 (diff) |
Cleanup: remove GLSL version checks
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl')
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl index b7697b0a3cc..b94c814672f 100644 --- a/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_image_color_frag.glsl @@ -1,12 +1,7 @@ -#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 uniform vec4 color; uniform sampler2D image; |