Merge pull request #55676 from RandomShaper/fix_layered_lightmap_3.x

[3.x] Fix atlassed lightmaps not visible on GL ES 3
This commit is contained in:
Rémi Verschelde 2021-12-06 21:44:27 +01:00 committed by GitHub
commit 71d8ccbe9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1850,10 +1850,11 @@ void RasterizerSceneGLES3::_setup_light(RenderList::Element *e, const Transform
RasterizerStorageGLES3::LightmapCapture *capture = storage->lightmap_capture_data_owner.getornull(e->instance->lightmap_capture->base);
if (lightmap && capture) {
glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 10);
if (e->instance->lightmap_slice == -1) {
glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 10);
glBindTexture(GL_TEXTURE_2D, lightmap->tex_id);
} else {
glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 11);
glBindTexture(GL_TEXTURE_2D_ARRAY, lightmap->tex_id);
state.scene_shader.set_uniform(SceneShaderGLES3::LIGHTMAP_LAYER, e->instance->lightmap_slice);
}