diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-22 21:17:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-22 21:17:15 +0200 |
| commit | 6149ed0296d0760ec2b4d30aa002dd3c1500ca5c (patch) | |
| tree | 3a5c60e5ba34bf9aac57014f6d3a972c655b60ed /drivers/gles2/rasterizer_scene_gles2.cpp | |
| parent | 2e065d8ad07bb20fede0d0c0b2d33d6628033024 (diff) | |
| parent | f5365aa0e12fe0ba2acb60a3fcb99126e0428b93 (diff) | |
Merge pull request #32252 from lawnjelly/skin-fix
Fix GLES2 skinning where VERTEX_TEXTURE not supported
Diffstat (limited to 'drivers/gles2/rasterizer_scene_gles2.cpp')
| -rw-r--r-- | drivers/gles2/rasterizer_scene_gles2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp index cc414c26af..96878c86b4 100644 --- a/drivers/gles2/rasterizer_scene_gles2.cpp +++ b/drivers/gles2/rasterizer_scene_gles2.cpp @@ -1432,11 +1432,11 @@ void RasterizerSceneGLES2::_setup_geometry(RenderList::Element *p_element, Raste } } - bool clear_skeleton_buffer = !storage->config.float_texture_supported; + bool clear_skeleton_buffer = storage->config.use_skeleton_software; if (p_skeleton) { - if (storage->config.float_texture_supported) { + if (!storage->config.use_skeleton_software) { //use float texture workflow glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 1); glBindTexture(GL_TEXTURE_2D, p_skeleton->tex_id); @@ -2452,7 +2452,7 @@ void RasterizerSceneGLES2::_render_render_list(RenderList::Element **p_elements, if (skeleton) { state.scene_shader.set_conditional(SceneShaderGLES2::USE_SKELETON, true); - state.scene_shader.set_conditional(SceneShaderGLES2::USE_SKELETON_SOFTWARE, !storage->config.float_texture_supported); + state.scene_shader.set_conditional(SceneShaderGLES2::USE_SKELETON_SOFTWARE, storage->config.use_skeleton_software); } else { state.scene_shader.set_conditional(SceneShaderGLES2::USE_SKELETON, false); state.scene_shader.set_conditional(SceneShaderGLES2::USE_SKELETON_SOFTWARE, false); |