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 | |
| 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')
4 files changed, 2 insertions, 13 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 83caef29ca3..37ffb1b9d6d 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -593,7 +593,6 @@ struct ImBuf *ED_view3d_draw_offscreen_imbuf(struct Depsgraph *depsgraph, int sizey, unsigned int flag, int alpha_mode, - int samples, const char *viewname, struct GPUOffScreen *ofs, char err_out[256]); @@ -607,7 +606,6 @@ struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(struct Depsgraph *depsgraph, unsigned int flag, unsigned int draw_flags, int alpha_mode, - int samples, const char *viewname, struct GPUOffScreen *ofs, char err_out[256]); 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; diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index fa4e250871e..510d734451b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -6209,7 +6209,6 @@ static int texture_paint_image_from_view_exec(bContext *C, wmOperator *op) h, IB_rect, R_ALPHAPREMUL, - 0, NULL, NULL, err_out); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 5f029e840d3..6235f994272 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1688,7 +1688,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph, int sizey, uint flag, int alpha_mode, - int samples, const char *viewname, /* output vars */ GPUOffScreen *ofs, @@ -1717,7 +1716,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph, if (own_ofs) { /* bind */ - ofs = GPU_offscreen_create(sizex, sizey, samples, true, false, err_out); + ofs = GPU_offscreen_create(sizex, sizey, 0, true, false, err_out); if (ofs == NULL) { DRW_opengl_context_disable(); return NULL; @@ -1835,7 +1834,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Depsgraph *depsgraph, uint flag, uint draw_flags, int alpha_mode, - int samples, const char *viewname, GPUOffScreen *ofs, char err_out[256]) @@ -1909,7 +1907,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Depsgraph *depsgraph, height, flag, alpha_mode, - samples, viewname, ofs, err_out); |