archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Eevee: Fix wrong SSR reprojection when switching orthographic view

Browse Source 
We just reset the temporal sampling and avoid using the previous frame
for SSR at all.
This commit is contained in:
Clément Foucault
2018-07-20 22:43:30 +02:00
parent 3005c2e2be
commit a1689fb091
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/engines/eevee/eevee_private.h
View File

@@ -515,6 +515,7 @@ typedef struct EEVEE_EffectsInfo {
int volume_current_sample; int volume_current_sample;
/* SSR */ /* SSR */
bool reflection_trace_full; bool reflection_trace_full;
bool ssr_was_persp;
int ssr_neighbor_ofs; int ssr_neighbor_ofs;
int ssr_halfres_ofs[2]; int ssr_halfres_ofs[2];
struct GPUTexture *ssr_normal_input; /* Textures from pool */ struct GPUTexture *ssr_normal_input; /* Textures from pool */
@@ -908,6 +909,7 @@ void EEVEE_mist_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat
void EEVEE_mist_free(void); void EEVEE_mist_free(void);
/* eevee_temporal_sampling.c */ /* eevee_temporal_sampling.c */
void EEVEE_temporal_sampling_reset(EEVEE_Data *vedata);
int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
void EEVEE_temporal_sampling_matrices_calc( void EEVEE_temporal_sampling_matrices_calc(
EEVEE_EffectsInfo *effects, float viewmat[4][4], float persmat[4][4], const double ht_point[2]); EEVEE_EffectsInfo *effects, float viewmat[4][4], float persmat[4][4], const double ht_point[2]);

8
source/blender/draw/engines/eevee/eevee_screen_raytrace.c
View File

@@ -132,6 +132,14 @@ int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
}); });
} }
const bool is_persp = DRW_viewport_is_persp_get();
if (effects->ssr_was_persp != is_persp) {
effects->ssr_was_persp = is_persp;
DRW_viewport_request_redraw();
EEVEE_temporal_sampling_reset(vedata);
stl->g_data->valid_double_buffer = false;
}
effects->reflection_trace_full = (scene_eval->eevee.flag & SCE_EEVEE_SSR_HALF_RESOLUTION) == 0; effects->reflection_trace_full = (scene_eval->eevee.flag & SCE_EEVEE_SSR_HALF_RESOLUTION) == 0;
common_data->ssr_thickness = scene_eval->eevee.ssr_thickness; common_data->ssr_thickness = scene_eval->eevee.ssr_thickness;
common_data->ssr_border_fac = scene_eval->eevee.ssr_border_fade; common_data->ssr_border_fac = scene_eval->eevee.ssr_border_fade;

5
source/blender/draw/engines/eevee/eevee_temporal_sampling.c
View File

@@ -174,6 +174,11 @@ void EEVEE_temporal_sampling_matrices_calc(
invert_m4_m4(effects->overide_wininv, effects->overide_winmat); invert_m4_m4(effects->overide_wininv, effects->overide_winmat);
} }
void EEVEE_temporal_sampling_reset(EEVEE_Data *vedata)
{
vedata->stl->effects->taa_render_sample = 1;
}
int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
{ {
EEVEE_StorageList *stl = vedata->stl; EEVEE_StorageList *stl = vedata->stl;