griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #143802: Grease Pencil: Divide blend mode not working in viewport

Browse Source 
For the "Divide" layer blend mode to work in the viewport, we need to use
a floating point texture format for rendering.

This changes the format to always use floats for the `color` textures,
but still switches the `reveal_tx` to use integers in the viewport, and
only floating point during final render.

Pull Request: https://projects.blender.org/blender/blender/pulls/143993
This commit is contained in:
Falk David
2025-08-05 14:23:49 +02:00
committed by Falk David
parent e4fc33adfc
commit 00a979f2aa
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/draw/engines/gpencil/gpencil_engine_c.cc
View File

@@ -172,13 +172,12 @@ void Instance::begin_sync()
this->use_layer_fb = false;
this->use_object_fb = false;
this->use_mask_fb = false;
this->use_separate_pass =
draw_ctx->is_viewport_compositor_enabled() ?
bke::compositor::get_used_passes(*scene, view_layer).contains("GreasePencil") :
false;
/* Always use high precision for render and viewport compositor (viewport compositor only takes
* RGBA16F/32F formats). */
this->use_signed_fb = this->use_separate_pass || !this->is_viewport;
const bool use_viewport_compositor = draw_ctx->is_viewport_compositor_enabled();
const bool has_grease_pencil_pass =
bke::compositor::get_used_passes(*scene, view_layer).contains("GreasePencil");
this->use_separate_pass = use_viewport_compositor ? has_grease_pencil_pass : false;
this->use_signed_fb = !this->is_viewport;
if (draw_ctx->v3d) {
const bool hide_overlay = ((draw_ctx->v3d->flag2 & V3D_HIDE_OVERLAYS) != 0);
@@ -612,9 +611,7 @@ void Instance::acquire_resources()
const int2 size = int2(draw_ctx->viewport_size_get());
const gpu::TextureFormat format_color = this->use_signed_fb ?
gpu::TextureFormat::SFLOAT_16_16_16_16 :
gpu::TextureFormat::UFLOAT_11_11_10;
const gpu::TextureFormat format_color = gpu::TextureFormat::SFLOAT_16_16_16_16;
const gpu::TextureFormat format_reveal = this->use_signed_fb ?
gpu::TextureFormat::SFLOAT_16_16_16_16 :
gpu::TextureFormat::UNORM_10_10_10_2;

2
source/blender/draw/engines/gpencil/gpencil_engine_private.hh
View File

@@ -279,7 +279,7 @@ struct Instance final : public DrawEngine {
* pass. */
bool use_separate_pass;
/* Some blend mode needs to add negative values.
* This is only supported if target texture is signed. */
* This is only supported if target texture is signed. Only switch for the `reveal_tex`. */
bool use_signed_fb;
/* Use only lines for multiedit and not active frame. */
bool use_multiedit_lines_only;