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

Fixed usage of proxy textures on GLES2 sky
godotengine · May 7, 2021 · 1f202ff · 1f202ff
2 parents 1690eb7 + eed4655
commit 1f202ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp
@@ -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);
 

diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp
@@ -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);