diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-01-13 01:42:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-13 01:42:52 +0100 |
commit | e1a0f2bd717b884b2d6bdbf31f66d112e3fbcd56 (patch) | |
tree | c8096f4ca6c0a7c68da5665828dcfcc334bfbbbd /drivers | |
parent | 4fd4b0399a4cedfc44eefd5ca27e7541d523c4ea (diff) | |
parent | 408f4cb146f96808d3d2cc51dab6aa83be87a205 (diff) |
Merge pull request #15636 from mrcdk/fix_canvas_light
Set correct types on a couple variables inside light_compute in canvas.glsl
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gles3/shaders/canvas.glsl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 46641482ec..f436ef06f7 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -285,7 +285,7 @@ MATERIAL_UNIFORMS FRAGMENT_SHADER_GLOBALS -void light_compute(inout vec3 light,vec3 light_vec,float light_height,vec4 light_color,vec2 light_uv,vec4 shadow,vec3 normal,vec2 uv,vec2 screen_uv,vec4 color) { +void light_compute(inout vec4 light,vec2 light_vec,float light_height,vec4 light_color,vec2 light_uv,vec4 shadow,vec3 normal,vec2 uv,vec2 screen_uv,vec4 color) { #if defined(USE_LIGHT_SHADER_CODE) |