diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-08-30 20:19:59 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-08-30 20:33:37 +0300 |
| commit | 17f26e181febbc72b873131c40bea6d508264641 (patch) | |
| tree | 195147784a713e746011cf9fafbcb013c3d794fd /intern/opencolorio | |
| parent | cc830e25869c702fa8e648ce74aae615bbeded4b (diff) | |
OCIO: use modern GLSL texture functions
small part of ongoing OpenGL upgrade
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/gpu_shader_display_transform.glsl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/opencolorio/gpu_shader_display_transform.glsl b/intern/opencolorio/gpu_shader_display_transform.glsl index 372d41dfecb..ae0c524300d 100644 --- a/intern/opencolorio/gpu_shader_display_transform.glsl +++ b/intern/opencolorio/gpu_shader_display_transform.glsl @@ -12,7 +12,6 @@ uniform float image_texture_height; in vec2 texCoord_interp; out vec4 fragColor; -#define texture2D texture #ifdef USE_CURVE_MAPPING /* Curve mapping parameters @@ -42,7 +41,7 @@ float read_curve_mapping(int table, int index) * But is it actually correct to subtract 1 here? */ float texture_index = float(index) / float(curve_mapping_lut_size - 1); - return texture1D(curve_mapping_texture, texture_index)[table]; + return texture(curve_mapping_texture, texture_index)[table]; } float curvemap_calc_extend(int table, float x, vec2 first, vec2 last) @@ -147,7 +146,7 @@ vec4 apply_dither(vec2 st, vec4 col) void main() { - vec4 col = texture2D(image_texture, texCoord_interp.st); + vec4 col = texture(image_texture, texCoord_interp.st); #ifdef USE_CURVE_MAPPING col = curvemapping_evaluate_premulRGBF(col); #endif |