Page MenuHome
Paste P451

Fix T53314 ?
ActivePublic
Actions

Authored by Germano Cavalcante (mano-wii) on Mar 10 2017, 5:56 AM.
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c
index 86d767df313..9d504c08381 100644
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@ -441,8 +441,7 @@ void EEVEE_draw_effects(EEVEE_Data *vedata)
SWAP_DOUBLE_BUFFERS();
if (!stl->g_data->valid_double_buffer &&
- ((effects->enabled_effects & EFFECT_DOUBLE_BUFFER) != 0) &&
- (DRW_state_is_image_render() == false))
+ ((effects->enabled_effects & EFFECT_DOUBLE_BUFFER) != 0))
{
/* If history buffer is not valid request another frame.
* This fix black reflections on area resize. */
@@ -451,11 +450,6 @@ void EEVEE_draw_effects(EEVEE_Data *vedata)
/* Record pers matrix for the next frame. */
DRW_viewport_matrix_get(stl->g_data->prev_persmat, DRW_MAT_PERS);
-
- /* Update double buffer status if render mode. */
- if (DRW_state_is_image_render()) {
- stl->g_data->valid_double_buffer = (txl->color_double_buffer != NULL);
- }
}
void EEVEE_effects_free(void)
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c
index 4ca59aaa39e..f99b29d73e4 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -169,21 +169,9 @@ static void EEVEE_draw_scene(void *vedata)
/* Default framebuffer and texture */
DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
- /* Number of iteration: needed for all temporal effect (SSR, TAA)
- * when using opengl render. */
- int loop_ct = DRW_state_is_image_render() ? 4 : 1;
-
static float rand = 0.0f;
- /* XXX temp for denoising render. TODO plug number of samples here */
- if (DRW_state_is_image_render()) {
- rand += 1.0f / 16.0f;
- rand = rand - floorf(rand);
-
- /* Set jitter offset */
- EEVEE_update_util_texture(rand);
- }
- else if (((stl->effects->enabled_effects & EFFECT_TAA) != 0) && (stl->effects->taa_current_sample > 1)) {
+ if (((stl->effects->enabled_effects & EFFECT_TAA) != 0) && (stl->effects->taa_current_sample > 1)) {
double r;
BLI_halton_1D(2, 0.0, stl->effects->taa_current_sample - 1, &r);
@@ -192,7 +180,7 @@ static void EEVEE_draw_scene(void *vedata)
EEVEE_update_util_texture((float)r);
}
- while (loop_ct--) {
+ {
/* Refresh Probes */
DRW_stats_group_start("Probes Refresh");
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 672149b9e43..c0bad0bac8a 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -3437,10 +3437,18 @@ void DRW_draw_render_loop_offscreen(
rv3d->viewport = GPU_viewport_create_from_offscreen(ofs);
}
- /* Reset before using it. */
- memset(&DST, 0x0, sizeof(DST));
- DST.options.is_image_render = true;
- DRW_draw_render_loop_ex(graph, engine, ar, v3d, NULL);
+ bool is_request_redraw = GPU_viewport_do_update(rv3d->viewport);
+ do {
+ /* Reset before using it. */
+ memset(&DST, 0x0, sizeof(DST));
+ DST.options.is_image_render = true;
+
+ DRW_draw_render_loop_ex(graph, engine, ar, v3d, NULL);
+ } while (GPU_viewport_do_update(rv3d->viewport));
+
+ if (is_request_redraw) {
+ DRW_viewport_request_redraw();
+ }
/* restore */
{