diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-05-02 16:18:53 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-05-02 17:19:12 +0300 |
| commit | b52a0c78aff3afd49c0712ee35ba01f6b48662f7 (patch) | |
| tree | 3dadc3f008de4c77962299777357a6075732ce41 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 76193106d2e3d1d211af33f39a3714e22944cb18 (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/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index baa9b3ed5c3..902208a1629 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -670,7 +670,7 @@ typedef struct RenderData { /** * The number of samples to use per pixel. */ - short osa; + short osa DNA_DEPRECATED; short frs_sec; char _pad[6]; @@ -1566,6 +1566,11 @@ typedef struct SceneDisplay { float matcap_ssao_attenuation; int matcap_ssao_samples; + /** Method of AA for viewport rendering and image rendering */ + char viewport_aa; + char render_aa; + char _pad[6]; + /** OpenGL render engine settings. */ View3DShading shading; } SceneDisplay; @@ -1772,7 +1777,7 @@ typedef struct Scene { #define SCER_SHOW_SUBFRAME (1 << 3) /* RenderData.mode */ -#define R_OSA (1 << 0) +#define R_MODE_UNUSED_0 (1 << 0) /* cleared */ #define R_MODE_UNUSED_1 (1 << 1) /* cleared */ #define R_MODE_UNUSED_2 (1 << 2) /* cleared */ #define R_MODE_UNUSED_3 (1 << 3) /* cleared */ @@ -2397,6 +2402,17 @@ enum { SHADOW_METHOD_MAX = 3, }; +/* SceneDisplay->render_aa, SceneDisplay->viewport_aa */ +enum { + SCE_DISPLAY_AA_OFF = 0, + SCE_DISPLAY_AA_FXAA = 1, + SCE_DISPLAY_AA_SAMPLES_5 = 5, + SCE_DISPLAY_AA_SAMPLES_8 = 8, + SCE_DISPLAY_AA_SAMPLES_11 = 11, + SCE_DISPLAY_AA_SAMPLES_16 = 16, + SCE_DISPLAY_AA_SAMPLES_32 = 32, +}; + #ifdef __cplusplus } #endif |