godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Sanitize INF/NaN when copying last frame texture for SSIL/SSR.

Browse Source
This commit is contained in:
Skyth
2025-11-13 16:38:54 +03:00
parent e6aa06d3de
commit d27e4dab16
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
servers/rendering/renderer_rd/effects/copy_effects.cpp
View File

@@ -358,7 +358,7 @@ CopyEffects::~CopyEffects() {
singleton = nullptr; singleton = nullptr;
} }
void CopyEffects::copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y, bool p_force_luminance, bool p_all_source, bool p_8_bit_dst, bool p_alpha_to_one) { void CopyEffects::copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y, bool p_force_luminance, bool p_all_source, bool p_8_bit_dst, bool p_alpha_to_one, bool p_sanitize_inf_nan) {
UniformSetCacheRD *uniform_set_cache = UniformSetCacheRD::get_singleton(); UniformSetCacheRD *uniform_set_cache = UniformSetCacheRD::get_singleton();
ERR_FAIL_NULL(uniform_set_cache); ERR_FAIL_NULL(uniform_set_cache);
MaterialStorage *material_storage = MaterialStorage::get_singleton(); MaterialStorage *material_storage = MaterialStorage::get_singleton();
@@ -381,6 +381,10 @@ void CopyEffects::copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, cons
copy.push_constant.flags |= COPY_FLAG_ALPHA_TO_ONE; copy.push_constant.flags |= COPY_FLAG_ALPHA_TO_ONE;
} }
if (p_sanitize_inf_nan) {
copy.push_constant.flags |= COPY_FLAG_SANITIZE_INF_NAN;
}
copy.push_constant.section[0] = p_rect.position.x; copy.push_constant.section[0] = p_rect.position.x;
copy.push_constant.section[1] = p_rect.position.y; copy.push_constant.section[1] = p_rect.position.y;
copy.push_constant.section[2] = p_rect.size.width; copy.push_constant.section[2] = p_rect.size.width;

3
servers/rendering/renderer_rd/effects/copy_effects.h
View File

@@ -131,6 +131,7 @@ private:
COPY_FLAG_FORCE_LUMINANCE = (1 << 6), COPY_FLAG_FORCE_LUMINANCE = (1 << 6),
COPY_FLAG_ALL_SOURCE = (1 << 7), COPY_FLAG_ALL_SOURCE = (1 << 7),
COPY_FLAG_ALPHA_TO_ONE = (1 << 8), COPY_FLAG_ALPHA_TO_ONE = (1 << 8),
COPY_FLAG_SANITIZE_INF_NAN = (1 << 9),
}; };
struct CopyPushConstant { struct CopyPushConstant {
@@ -323,7 +324,7 @@ public:
bool get_prefer_raster_effects() { return prefer_raster_effects; } bool get_prefer_raster_effects() { return prefer_raster_effects; }
void copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y = false, bool p_force_luminance = false, bool p_all_source = false, bool p_8_bit_dst = false, bool p_alpha_to_one = false); void copy_to_rect(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y = false, bool p_force_luminance = false, bool p_all_source = false, bool p_8_bit_dst = false, bool p_alpha_to_one = false, bool p_sanitize_inf_nan = false);
void copy_cubemap_to_panorama(RID p_source_cube, RID p_dest_panorama, const Size2i &p_panorama_size, float p_lod, bool p_is_array); void copy_cubemap_to_panorama(RID p_source_cube, RID p_dest_panorama, const Size2i &p_panorama_size, float p_lod, bool p_is_array);
void copy_depth_to_rect(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2i &p_rect, bool p_flip_y = false); void copy_depth_to_rect(RID p_source_rd_texture, RID p_dest_framebuffer, const Rect2i &p_rect, bool p_flip_y = false);
void copy_depth_to_rect_and_linearize(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y, float p_z_near, float p_z_far); void copy_depth_to_rect_and_linearize(RID p_source_rd_texture, RID p_dest_texture, const Rect2i &p_rect, bool p_flip_y, float p_z_near, float p_z_far);

2
servers/rendering/renderer_rd/effects/ss_effects.cpp
View File

@@ -412,7 +412,7 @@ void SSEffects::copy_internal_texture_to_last_frame(Ref<RenderSceneBuffersRD> p_
Size2i dest_size = RD::get_singleton()->texture_size(dest); Size2i dest_size = RD::get_singleton()->texture_size(dest);
if (m == 0 && source_size == dest_size) { if (m == 0 && source_size == dest_size) {
p_copy_effects.copy_to_rect(source, dest, Rect2i(Vector2i(), source_size)); p_copy_effects.copy_to_rect(source, dest, Rect2i(Vector2i(), source_size), false, false, false, false, false, true);
} else { } else {
p_copy_effects.make_mipmap(source, dest, dest_size); p_copy_effects.make_mipmap(source, dest, dest_size);
} }

6
servers/rendering/renderer_rd/shaders/effects/copy.glsl
View File

@@ -15,6 +15,7 @@ layout(local_size_x = 8, local_size_y = 8, local_size_z = 1) in;
#define FLAG_FORCE_LUMINANCE (1 << 6) #define FLAG_FORCE_LUMINANCE (1 << 6)
#define FLAG_COPY_ALL_SOURCE (1 << 7) #define FLAG_COPY_ALL_SOURCE (1 << 7)
#define FLAG_ALPHA_TO_ONE (1 << 8) #define FLAG_ALPHA_TO_ONE (1 << 8)
#define FLAG_SANITIZE_INF_NAN (1 << 9)
layout(push_constant, std430) uniform Params { layout(push_constant, std430) uniform Params {
ivec4 section; ivec4 section;
@@ -226,6 +227,11 @@ void main() {
color.a = 1.0; color.a = 1.0;
} }
if (bool(params.flags & FLAG_SANITIZE_INF_NAN)) {
color = mix(color, vec4(100.0, 100.0, 100.0, 1.0), isinf(color));
color = mix(color, vec4(100.0, 100.0, 100.0, 1.0), isnan(color));
}
imageStore(dest_buffer, pos + params.target, color); imageStore(dest_buffer, pos + params.target, color);
#endif // MODE_SIMPLE_COPY #endif // MODE_SIMPLE_COPY