diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-12 08:32:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 08:32:06 +0200 |
| commit | ef91119502d306be7980e93f82953dc4010d2259 (patch) | |
| tree | 078d16926daffc9e1c0bae2e15b98e737b7bb14c /drivers/gles2 | |
| parent | 0cbde254e9e284dc030c67c89b284b975e746252 (diff) | |
| parent | 48f28c68bce3015bc24e52159dc2d597dffc7522 (diff) | |
Merge pull request #31271 from raphael10241024/gles2_shader
Fix GLES2 canvas shader uniform error
Diffstat (limited to 'drivers/gles2')
| -rw-r--r-- | drivers/gles2/rasterizer_canvas_gles2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 8a177e32b0..4716b29e03 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -1650,6 +1650,7 @@ void RasterizerCanvasGLES2::canvas_render_items(Item *p_item_list, int p_z, cons //always re-set uniforms, since light parameters changed _set_uniforms(); + state.canvas_shader.use_material((void *)material_ptr); glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 4); RasterizerStorageGLES2::Texture *t = storage->texture_owner.getornull(light->texture); |