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

Merge pull request #94233 from ChristopheClaustre/screenshot_compat_broken_with_hdr

Browse source 
Fix black `get_texture()` on viewport in compatibility mode with HDR enabled
This commit is contained in:
Rémi Verschelde 2024-07-18 10:45:30 +02:00
commit de27d3a7fc
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles3/storage/texture_storage.cpp
View file

@ -1030,10 +1030,8 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
if (texture->compressed) { if (texture->compressed) {
glPixelStorei(GL_PACK_ALIGNMENT, 4); glPixelStorei(GL_PACK_ALIGNMENT, 4);
glGetCompressedTexImage(texture->target, i, &w[ofs]); glGetCompressedTexImage(texture->target, i, &w[ofs]);
} else { } else {
glPixelStorei(GL_PACK_ALIGNMENT, 1); glPixelStorei(GL_PACK_ALIGNMENT, 1);
glGetTexImage(texture->target, i, texture->gl_format_cache, texture->gl_type_cache, &w[ofs]); glGetTexImage(texture->target, i, texture->gl_format_cache, texture->gl_type_cache, &w[ofs]);
} }
} }
@ -2123,7 +2121,7 @@ void TextureStorage::_update_render_target(RenderTarget *rt) {
texture->layers = 1; texture->layers = 1;
} }
texture->gl_format_cache = rt->color_format; texture->gl_format_cache = rt->color_format;
texture->gl_type_cache = GL_UNSIGNED_BYTE; texture->gl_type_cache = !rt->hdr ? GL_UNSIGNED_BYTE : GL_FLOAT; // to set HDR format size to 8 and keep 4 for LDR format
texture->gl_internal_format_cache = rt->color_internal_format; texture->gl_internal_format_cache = rt->color_internal_format;
texture->tex_id = rt->color; texture->tex_id = rt->color;
texture->width = rt->size.x; texture->width = rt->size.x;