asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #31271 from raphael10241024/gles2_shader

Browse source 
Fix GLES2 canvas shader uniform error
This commit is contained in:
Rémi Verschelde 2019-08-12 08:32:06 +02:00 committed by GitHub
commit ef91119502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gles2/rasterizer_canvas_gles2.cpp
View file

@ -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 //always re-set uniforms, since light parameters changed
_set_uniforms(); _set_uniforms();
state.canvas_shader.use_material((void *)material_ptr);
glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 4); glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 4);
RasterizerStorageGLES2::Texture *t = storage->texture_owner.getornull(light->texture); RasterizerStorageGLES2::Texture *t = storage->texture_owner.getornull(light->texture);