maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #48541 from parulina/gles2-viewporttexture-fix

Browse source 
Fixed usage of proxy textures on GLES2 sky
This commit is contained in:
Rémi Verschelde 2021-05-07 21:56:37 +02:00 committed by GitHub
parent 1690eb7266 eed4655644
commit 1f202ff099
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gles2/rasterizer_scene_gles2.cpp
View file

@ -2815,6 +2815,8 @@ void RasterizerSceneGLES2::_draw_sky(RasterizerStorageGLES2::Sky *p_sky, const C
RasterizerStorageGLES2::Texture *tex = storage->texture_owner.getornull(p_sky->panorama);
ERR_FAIL_COND(!tex);
tex = tex->get_ptr(); //resolve for proxies
glActiveTexture(GL_TEXTURE0);
glBindTexture(tex->target, tex->tex_id);

2
drivers/gles2/rasterizer_storage_gles2.cpp
View file

@ -1162,6 +1162,8 @@ void RasterizerStorageGLES2::sky_set_texture(RID p_sky, RID p_panorama, int p_ra
ERR_FAIL_COND(!texture);
}
texture = texture->get_ptr(); //resolve for proxies
// glBindVertexArray(0) and more
{
glBindBuffer(GL_ARRAY_BUFFER, 0);