Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2019-05-14 17:43:37 +0300
committerClément Foucault <foucault.clem@gmail.com>2019-05-14 17:43:37 +0300
commit8437519d0282e4d6ccb2f22d042bcaba2ac7d603 (patch)
treef29372aefbeb3f9f01b64ca8885c685312d10a93 /source/blender/draw/modes/shaders
parent3db428406f69358f7bc81e8f757f733338236a29 (diff)
Fix Shader compilation error on MacOS & some other platform/driver
texture2D() is no longer supported by modern opengl, use texture() instead.
Diffstat (limited to 'source/blender/draw/modes/shaders')
-rw-r--r--source/blender/draw/modes/shaders/object_empty_image_frag.glsl2
-rw-r--r--source/blender/draw/modes/shaders/paint_texture_frag.glsl2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/modes/shaders/object_empty_image_frag.glsl b/source/blender/draw/modes/shaders/object_empty_image_frag.glsl
index dbc403dc39b..deb82a8904e 100644
--- a/source/blender/draw/modes/shaders/object_empty_image_frag.glsl
+++ b/source/blender/draw/modes/shaders/object_empty_image_frag.glsl
@@ -28,7 +28,7 @@ vec4 texture_read_as_srgb(sampler2D tex, vec2 co)
{
/* By convention image textures return scene linear colors, but
* overlays still assume srgb. */
- vec4 color = texture2D(tex, co);
+ vec4 color = texture(tex, co);
color.r = linearrgb_to_srgb(color.r);
color.g = linearrgb_to_srgb(color.g);
color.b = linearrgb_to_srgb(color.b);
diff --git a/source/blender/draw/modes/shaders/paint_texture_frag.glsl b/source/blender/draw/modes/shaders/paint_texture_frag.glsl
index 5d74213a445..4a3c5cb430c 100644
--- a/source/blender/draw/modes/shaders/paint_texture_frag.glsl
+++ b/source/blender/draw/modes/shaders/paint_texture_frag.glsl
@@ -30,7 +30,7 @@ vec4 texture_read_as_srgb(sampler2D tex, vec2 co)
{
/* By convention image textures return scene linear colors, but
* overlays still assume srgb. */
- vec4 color = texture2D(tex, co);
+ vec4 color = texture(tex, co);
color.r = linearrgb_to_srgb(color.r);
color.g = linearrgb_to_srgb(color.g);
color.b = linearrgb_to_srgb(color.b);