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:
authorMike Erwin <significant.bit@gmail.com>2017-05-19 18:02:32 +0300
committerMike Erwin <significant.bit@gmail.com>2017-05-19 18:09:12 +0300
commit648f2a61ada53e07162efcf117e8b0269a55f5a8 (patch)
treebc80c48cb2d277a79ba62f800e5122b6615c811d /source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
parentfa47437426b8e4d72d15bcf3517b31c4202c095c (diff)
OpenGL: convert old texture2D calls in built-in shaders
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl b/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
index aa3b8bd2727..64662247d69 100644
--- a/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_image_shuffle_color_frag.glsl
@@ -1,7 +1,6 @@
in vec2 texCoord_interp;
out vec4 fragColor;
-#define texture2D texture
uniform sampler2D image;
uniform vec4 color;
@@ -9,7 +8,7 @@ uniform vec4 shuffle;
void main()
{
- vec4 sample = texture2D(image, texCoord_interp);
+ vec4 sample = texture(image, texCoord_interp);
fragColor = vec4(sample.r * shuffle.r +
sample.g * shuffle.g +
sample.b * shuffle.b +