diff options
| author | Allen Pestaluky <allenpestaluky@gmail.com> | 2023-05-26 10:50:35 -0400 |
|---|---|---|
| committer | Allen Pestaluky <allenpestaluky@gmail.com> | 2023-05-26 10:50:35 -0400 |
| commit | 4e19f34856e9499735c1ed5c55c6b2a503ab9651 (patch) | |
| tree | 160bcc29a74d2eec0e148bd4788b35b77b3611dc | |
| parent | d984ad64d440320e40e85dbcb79b8e9240f75493 (diff) | |
| download | redot-engine-4e19f34856e9499735c1ed5c55c6b2a503ab9651.tar.gz | |
Changed Subtract blend mode of Forward+ and Mobile renderers to match behaviour of the Godot 3 and Compatibility renderers
The OpenGL implementation has used GL_FUNC_REVERSE_SUBTRACT for a long time, but the new RenderingDevice abstraction used by the Vulkan renderers had been mistakenly set to BLEND_OP_SUBTRACT instead of BLEND_OP_REVERSE_SUBTRACT.
Fixes #77448
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/classes/RDPipelineColorBlendStateAttachment.xml b/doc/classes/RDPipelineColorBlendStateAttachment.xml index 4892536814..783c8b1864 100644 --- a/doc/classes/RDPipelineColorBlendStateAttachment.xml +++ b/doc/classes/RDPipelineColorBlendStateAttachment.xml @@ -32,8 +32,8 @@ [codeblock] var attachment = RDPipelineColorBlendStateAttachment.new() attachment.enable_blend = true - attachment.alpha_blend_op = RenderingDevice.BLEND_OP_SUBTRACT - attachment.color_blend_op = RenderingDevice.BLEND_OP_SUBTRACT + attachment.alpha_blend_op = RenderingDevice.BLEND_OP_REVERSE_SUBTRACT + attachment.color_blend_op = RenderingDevice.BLEND_OP_REVERSE_SUBTRACT attachment.src_color_blend_factor = RenderingDevice.BLEND_FACTOR_SRC_ALPHA attachment.dst_color_blend_factor = RenderingDevice.BLEND_FACTOR_ONE attachment.src_alpha_blend_factor = RenderingDevice.BLEND_FACTOR_SRC_ALPHA diff --git a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp index 38b9367cbd..df455b27d9 100644 --- a/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp +++ b/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp @@ -207,8 +207,8 @@ void SceneShaderForwardClustered::ShaderData::set_code(const String &p_code) { } break; case BLEND_MODE_SUB: { blend_attachment.enable_blend = true; - blend_attachment.alpha_blend_op = RD::BLEND_OP_SUBTRACT; - blend_attachment.color_blend_op = RD::BLEND_OP_SUBTRACT; + blend_attachment.alpha_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT; + blend_attachment.color_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT; blend_attachment.src_color_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA; blend_attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ONE; blend_attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA; diff --git a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp index 0cc08975a5..23714c1091 100644 --- a/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp +++ b/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp @@ -218,8 +218,8 @@ void SceneShaderForwardMobile::ShaderData::set_code(const String &p_code) { } break; case BLEND_MODE_SUB: { blend_attachment.enable_blend = true; - blend_attachment.alpha_blend_op = RD::BLEND_OP_SUBTRACT; - blend_attachment.color_blend_op = RD::BLEND_OP_SUBTRACT; + blend_attachment.alpha_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT; + blend_attachment.color_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT; blend_attachment.src_color_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA; blend_attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ONE; blend_attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA; diff --git a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp index 5c6f630355..63ff8d7e6b 100644 --- a/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp +++ b/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp @@ -2121,8 +2121,8 @@ void RendererCanvasRenderRD::CanvasShaderData::set_code(const String &p_code) { } break; case BLEND_MODE_SUB: { attachment.enable_blend = true; - attachment.alpha_blend_op = RD::BLEND_OP_SUBTRACT; - attachment.color_blend_op = RD::BLEND_OP_SUBTRACT; + attachment.alpha_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT; + attachment.color_blend_op = RD::BLEND_OP_REVERSE_SUBTRACT; attachment.src_color_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA; attachment.dst_color_blend_factor = RD::BLEND_FACTOR_ONE; attachment.src_alpha_blend_factor = RD::BLEND_FACTOR_SRC_ALPHA; |