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>2017-04-10 17:58:08 +0300
committerClément Foucault <foucault.clem@gmail.com>2017-04-10 17:59:20 +0300
commit5f7011603077511425febf2a7397b2cc7bba1720 (patch)
treecdc0c3825ce94cc328378c5cb01a57478a0348a4 /source/blender/gpu/shaders
parent01bd6da68fbbb78713bac60afba29f616fdf4784 (diff)
OpenGL: Fix textureXd deprecated calls.
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_fx_depth_resolve.glsl1
-rw-r--r--source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl1
-rw-r--r--source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl2
-rw-r--r--source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl2
4 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_fx_depth_resolve.glsl b/source/blender/gpu/shaders/gpu_shader_fx_depth_resolve.glsl
index 3ba455d34e7..468908b858c 100644
--- a/source/blender/gpu/shaders/gpu_shader_fx_depth_resolve.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_fx_depth_resolve.glsl
@@ -4,6 +4,7 @@ uniform sampler2D depthbuffer;
varying vec4 uvcoordsvar;
#else
in vec4 uvcoordsvar;
+ #define texture2D texture
#endif
void main(void)
diff --git a/source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl b/source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl
index 6b3f1b99594..02af48e1ba7 100644
--- a/source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl
@@ -44,6 +44,7 @@ uniform vec4 viewvecs[3];
in vec2 depth_uv4;
out vec4 FragColor;
+ #define texture2D texture
#endif
diff --git a/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl b/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
index 46feb91de6e..6ed9812eeec 100644
--- a/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_fx_dof_hq_frag.glsl
@@ -54,6 +54,8 @@ uniform vec4 viewvecs[3];
layout(location = 0) out vec4 fragData0;
layout(location = 1) out vec4 fragData1;
layout(location = 2) out vec4 fragData2;
+
+ #define texture2D texture
#endif
diff --git a/source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl b/source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl
index 4a6cc09f5ea..529132f85a9 100644
--- a/source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl
@@ -18,6 +18,8 @@ uniform sampler2D depthbuffer;
#else
in vec4 uvcoordsvar;
out vec4 FragColor;
+ #define texture1D texture
+ #define texture2D texture
#endif
/* ssao_params.x : pixel scale for the ssao radious */