Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111577 from Kaleb-Reid/fix-lightmap-luminance

Browse source 
Apply luminance multiplier in copy_cubemap_to_panorama
This commit is contained in:
Thaddeus Crews 2025-10-14 10:31:34 -05:00
commit 0400b703e4
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
servers/rendering/renderer_rd/effects/copy_effects.cpp
View file

@ -412,6 +412,8 @@ void CopyEffects::copy_cubemap_to_panorama(RID p_source_cube, RID p_dest_panoram
copy.push_constant.target[1] = 0; copy.push_constant.target[1] = 0;
copy.push_constant.camera_z_far = p_lod; copy.push_constant.camera_z_far = p_lod;
copy.push_constant.luminance_multiplier = prefer_raster_effects ? 2.0 : 1.0;
// setup our uniforms // setup our uniforms
RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED); RID default_sampler = material_storage->sampler_rd_get_default(RS::CANVAS_ITEM_TEXTURE_FILTER_LINEAR, RS::CANVAS_ITEM_TEXTURE_REPEAT_DISABLED);

2
servers/rendering/renderer_rd/effects/copy_effects.h
View file

@ -139,7 +139,7 @@ private:
int32_t section[4]; int32_t section[4];
int32_t target[2]; int32_t target[2];
uint32_t flags; uint32_t flags;
uint32_t pad; float luminance_multiplier;
// Glow. // Glow.
float glow_strength; float glow_strength;
float glow_bloom; float glow_bloom;

4
servers/rendering/renderer_rd/shaders/effects/copy.glsl
View file

@ -20,7 +20,7 @@ layout(push_constant, std430) uniform Params {
ivec4 section; ivec4 section;
ivec2 target; ivec2 target;
uint flags; uint flags;
uint pad; float luminance_multiplier;
// Glow. // Glow.
float glow_strength; float glow_strength;
float glow_bloom; float glow_bloom;
@ -276,7 +276,7 @@ void main() {
#else #else
vec4 color = textureLod(source_color, vec4(normal, params.camera_z_far), 0.0); //the biggest the lod the least the acne vec4 color = textureLod(source_color, vec4(normal, params.camera_z_far), 0.0); //the biggest the lod the least the acne
#endif #endif
imageStore(dest_buffer, pos + params.target, color); imageStore(dest_buffer, pos + params.target, color * params.luminance_multiplier);
#endif // defined(MODE_CUBEMAP_TO_PANORAMA) || defined(MODE_CUBEMAP_ARRAY_TO_PANORAMA) #endif // defined(MODE_CUBEMAP_TO_PANORAMA) || defined(MODE_CUBEMAP_ARRAY_TO_PANORAMA)
#ifdef MODE_SET_COLOR #ifdef MODE_SET_COLOR