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 /intern/opencolorio | |
parent | c8bf3984ee806cd035c47aa5d7f99828f5667dd7 (diff) |
Cleanup: remove GLSL version checks
Diffstat (limited to 'intern/opencolorio')
-rw-r--r-- | intern/opencolorio/gpu_shader_display_transform.glsl | 11 | ||||
-rw-r--r-- | intern/opencolorio/gpu_shader_display_transform_vertex.glsl | 12 |
2 files changed, 6 insertions, 17 deletions
diff --git a/intern/opencolorio/gpu_shader_display_transform.glsl b/intern/opencolorio/gpu_shader_display_transform.glsl index 4a63405045d..372d41dfecb 100644 --- a/intern/opencolorio/gpu_shader_display_transform.glsl +++ b/intern/opencolorio/gpu_shader_display_transform.glsl @@ -10,14 +10,9 @@ uniform float image_texture_width; uniform float image_texture_height; #endif -#if __VERSION__ < 130 - 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 #ifdef USE_CURVE_MAPPING /* Curve mapping parameters diff --git a/intern/opencolorio/gpu_shader_display_transform_vertex.glsl b/intern/opencolorio/gpu_shader_display_transform_vertex.glsl index 7f30d4b55a6..054f7f3ec91 100644 --- a/intern/opencolorio/gpu_shader_display_transform_vertex.glsl +++ b/intern/opencolorio/gpu_shader_display_transform_vertex.glsl @@ -1,15 +1,9 @@ uniform mat4 ModelViewProjectionMatrix; -#if __VERSION__ == 120 - attribute vec2 texCoord; - attribute vec2 pos; - varying vec2 texCoord_interp; -#else - in vec2 texCoord; - in vec2 pos; - out vec2 texCoord_interp; -#endif +in vec2 texCoord; +in vec2 pos; +out vec2 texCoord_interp; void main() { |