diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2019-12-05 16:21:57 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2019-12-06 09:45:07 +0300 |
| commit | 15abc9fe743e09f2ec7ef3a6bcfb8f4954bcf28c (patch) | |
| tree | 49fc31a16b2e89d0fd67f8756dc164c82098a23c /source/blender/editors/render | |
| parent | 601eafd104ca66e3baaa45e9ecb00989395c55d9 (diff) | |
Draw: Removal of MultiSample Buffers
Multisample buffers were used for smooth line drawing. As we now have
an algorithm that doesn't need the multisample buffers we can remove
them.
The user preference for viewport multi_sampling is replaced by single
toggle overlay `use_overlay_smooth_wire`. By default this setting is
enabled as the new drawing is really quick (<1ms) and uses zero hacks.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D6367
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index ad5f8ba6834..10244cfa3fd 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -114,7 +114,6 @@ typedef struct OGLRender { ImageUser iuser; GPUOffScreen *ofs; - int ofs_samples; int sizex, sizey; int write_still; @@ -371,7 +370,6 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R sizey, output_flags, alpha_mode, - oglrender->ofs_samples, viewname, oglrender->ofs, err_out); @@ -392,7 +390,6 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R output_flags, V3D_OFSDRAW_SHOW_ANNOTATION, alpha_mode, - oglrender->ofs_samples, viewname, oglrender->ofs, err_out); @@ -539,7 +536,6 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) const bool is_write_still = RNA_boolean_get(op->ptr, "write_still"); const eImageFormatDepth color_depth = (is_animation) ? scene->r.im_format.depth : R_IMF_CHAN_DEPTH_32; - const int samples = U.ogl_multisamples; char err_out[256] = "unknown"; if (G.background) { @@ -584,7 +580,7 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) /* corrects render size with actual size, not every card supports non-power-of-two dimensions */ DRW_opengl_context_enable(); /* Offscreen creation needs to be done in DRW context. */ - ofs = GPU_offscreen_create(sizex, sizey, samples, true, true, err_out); + ofs = GPU_offscreen_create(sizex, sizey, 0, true, true, err_out); DRW_opengl_context_disable(); if (!ofs) { @@ -607,7 +603,6 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op) * output video handles, which does need evaluated scene. */ oglrender->depsgraph = CTX_data_ensure_evaluated_depsgraph(C); oglrender->cfrao = scene->r.cfra; - oglrender->ofs_samples = samples; oglrender->write_still = is_write_still && !is_animation; oglrender->is_animation = is_animation; |