diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-24 14:38:35 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-24 14:38:50 +0300 |
commit | 1f453a8909527a95fedd597b4fdaab90c18712f9 (patch) | |
tree | 06013bf8175ffbcb6243ee515a195db7a25635c1 /intern/opencolorio/gpu_shader_display_transform.glsl | |
parent | 1e7475a5d7878642057ea0cb313b5ee0d4a8545e (diff) |
OpenColorIO: Update glsl implementation to be ready for ogl 3.3 core
Diffstat (limited to 'intern/opencolorio/gpu_shader_display_transform.glsl')
-rw-r--r-- | intern/opencolorio/gpu_shader_display_transform.glsl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/intern/opencolorio/gpu_shader_display_transform.glsl b/intern/opencolorio/gpu_shader_display_transform.glsl index 853bf575582..4a63405045d 100644 --- a/intern/opencolorio/gpu_shader_display_transform.glsl +++ b/intern/opencolorio/gpu_shader_display_transform.glsl @@ -10,6 +10,15 @@ 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 + #ifdef USE_CURVE_MAPPING /* Curve mapping parameters * @@ -143,7 +152,7 @@ vec4 apply_dither(vec2 st, vec4 col) void main() { - vec4 col = texture2D(image_texture, gl_TexCoord[0].st); + vec4 col = texture2D(image_texture, texCoord_interp.st); #ifdef USE_CURVE_MAPPING col = curvemapping_evaluate_premulRGBF(col); #endif @@ -165,8 +174,8 @@ void main() vec4 result = OCIODisplay(col, lut3d_texture); #ifdef USE_DITHER - result = apply_dither(gl_TexCoord[0].st, result); + result = apply_dither(texCoord_interp.st, result); #endif - gl_FragColor = result; + fragColor = result; } |