tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Workbench-Next: Support multiple samples for Viewport Image Render 

Allow rendering multiple samples from a single draw callback.

Pull Request: https://projects.blender.org/blender/blender/pulls/111661
This commit is contained in:
Miguel Pozo 2023-09-01 15:57:21 +02:00
parent 3d7db929a4
commit fc0f2bd73e
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/draw/engines/workbench/workbench_engine.cc
View File

@ -495,6 +495,25 @@ class Instance {
DRW_viewport_request_redraw();
}
}
void draw_viewport_image_render(Manager &manager,
GPUTexture *depth_tx,
GPUTexture *depth_in_front_tx,
GPUTexture *color_tx)
{
BLI_assert(scene_state.sample == 0);
for (auto i : IndexRange(scene_state.samples_len)) {
if (i != 0) {
scene_state.sample = i;
/* Re-sync anything dependent on scene_state.sample. */
resources.init(scene_state);
dof_ps.init(scene_state);
anti_aliasing_ps.init(scene_state);
anti_aliasing_ps.sync(resources, scene_state.resolution);
}
this->draw(manager, depth_tx, depth_in_front_tx, color_tx);
}
}
};
} // namespace blender::workbench
@ -571,7 +590,13 @@ static void workbench_draw_scene(void *vedata)
}
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
draw::Manager *manager = DRW_manager_get();
ved->instance->draw_viewport(*manager, dtxl->depth, dtxl->depth_in_front, dtxl->color);
if (DRW_state_is_viewport_image_render()) {
ved->instance->draw_viewport_image_render(
*manager, dtxl->depth, dtxl->depth_in_front, dtxl->color);
}
else {
ved->instance->draw_viewport(*manager, dtxl->depth, dtxl->depth_in_front, dtxl->color);
}
}
static void workbench_instance_free(void *instance)

3
source/blender/draw/engines/workbench/workbench_state.cc
View File

@ -138,9 +138,8 @@ void SceneState::init(Object *camera_ob /*= nullptr*/)
else if (DRW_state_is_scene_render()) {
_samples_len = scene->display.render_aa;
}
if (is_navigating || is_playback || DRW_state_is_viewport_image_render()) {
if (is_navigating || is_playback) {
/* Only draw using SMAA or no AA when navigating. */
/* Same for viewport image render, since it's limited to a single sample. */
_samples_len = min_ii(_samples_len, 1);
}
/* 0 samples means no AA */