Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-05-02 16:18:53 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-05-02 17:19:12 +0300
commitb52a0c78aff3afd49c0712ee35ba01f6b48662f7 (patch)
tree3dadc3f008de4c77962299777357a6075732ce41 /source/blender/draw/engines/eevee/eevee_engine.c
parent76193106d2e3d1d211af33f39a3714e22944cb18 (diff)
Workbench,EEVEE: Viewport Render Samples
- Add `render_aa` and `viewport_aa` sampling setting for workbench. 0 samples means no AA, 1 sample uses FXAA and more samples will use TAA. The viewport `gpu_viewport_quality` can still limit viewport anti-aliasing method. - Use TAA when rendering images. (this used to be CPU based FSAA) - Removed `R_OSA` related settings. Reviewers: fclem, brecht Maniphest Tasks: T60847 Differential Revision: https://developer.blender.org/D4773
Diffstat (limited to 'source/blender/draw/engines/eevee/eevee_engine.c')
-rw-r--r--source/blender/draw/engines/eevee/eevee_engine.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 962bc8e5efb..26f33f4db31 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -180,12 +180,13 @@ static void eevee_draw_background(void *vedata)
/* Sort transparents before the loop. */
DRW_pass_sort_shgroup_z(psl->transparent_pass);
- /* Number of iteration: needed for all temporal effect (SSR, volumetrics)
- * when using opengl render. */
- int loop_len = (DRW_state_is_image_render() &&
- (stl->effects->enabled_effects & (EFFECT_VOLUMETRIC | EFFECT_SSR)) != 0) ?
- 4 :
- 1;
+ /* Number of iteration: Use viewport taa_samples when using viewport rendering */
+ int loop_len = 1;
+ if (DRW_state_is_image_render()) {
+ const DRWContextState *draw_ctx = DRW_context_state_get();
+ const Scene *scene = draw_ctx->scene;
+ loop_len = MAX2(1, scene->eevee.taa_samples);
+ }
while (loop_len--) {
float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f};