diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 19:12:25 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 19:12:25 -0300 |
| commit | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (patch) | |
| tree | 5f9c387037d0142d40f7275575436483dc0a7237 /drivers/gles2/shaders/canvas.glsl | |
| parent | ab4126f51061277e87b41c48b40e7b54942d4eca (diff) | |
| parent | 45c5c89de961357a7042d9e1f063e288d7a510cf (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'drivers/gles2/shaders/canvas.glsl')
| -rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 5f4767940d..eeab42ee64 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -105,8 +105,8 @@ precision mediump float; precision mediump int; #endif - // texunit:0 -uniform sampler2D texture; + +uniform sampler2D texture; // texunit:0 varying vec2 uv_interp; varying vec4 color_interp; @@ -319,7 +319,7 @@ LIGHT_SHADER_CODE #ifdef USE_DEPTH_SHADOWS -#define SHADOW_DEPTH(m_tex,m_uv) (texture2D((m_tex),(m_uv)).z) +#define SHADOW_DEPTH(m_tex,m_uv) (texture2D((m_tex),(m_uv)).r) #else @@ -395,5 +395,6 @@ LIGHT_SHADER_CODE // color.rgb*=color.a; gl_FragColor = color; + } |