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

Fix #132752: Image Engine: Clearing when no image present

Browse Source 
When no image is present the depth and color buffers aren't correctly
cleared, resulting in showing the previous buffers.

Replaced the clear on bind with regular clearing operations.

Alternative implementation for !132751

Pull Request: https://projects.blender.org/blender/blender/pulls/132844
This commit is contained in:
Jeroen Bakker
2025-01-09 09:31:44 +01:00
parent 1fe52f43e4
commit 59bc024fd8
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/draw/engines/image/image_drawing_mode.cc
View File

@@ -379,27 +379,13 @@ void ScreenSpaceDrawingMode::draw_finish() const
void ScreenSpaceDrawingMode::draw_viewport() const
{
float clear_depth = instance_.state.flags.do_tile_drawing ? 0.75 : 1.0f;
if (GPU_type_matches_ex(GPU_DEVICE_ANY, GPU_OS_ANY, GPU_DRIVER_ANY, GPU_BACKEND_OPENGL)) {
/* OpenGL doesn't support clearing depth stencil via load store actions as the data types
* should match. */
GPU_framebuffer_bind(instance_.state.depth_fb);
instance_.state.depth_fb.clear_depth(clear_depth);
}
else {
GPU_framebuffer_bind_ex(instance_.state.depth_fb,
{
{GPU_LOADACTION_CLEAR, GPU_STOREACTION_STORE, {clear_depth}},
});
}
GPU_framebuffer_bind(instance_.state.depth_fb);
instance_.state.depth_fb.clear_depth(clear_depth);
instance_.manager->submit(instance_.state.depth_ps, instance_.state.view);
GPU_framebuffer_bind_ex(
instance_.state.color_fb,
{
{GPU_LOADACTION_DONT_CARE, GPU_STOREACTION_DONT_CARE, {0.0f}},
{GPU_LOADACTION_CLEAR, GPU_STOREACTION_STORE, {0.0f, 0.0f, 0.0f, 0.0f}},
});
GPU_framebuffer_bind(instance_.state.color_fb);
float4 clear_color = float4(0.0);
GPU_framebuffer_clear_color(instance_.state.color_fb, clear_color);
instance_.manager->submit(instance_.state.image_ps, instance_.state.view);
}