diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-12-11 01:17:07 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-12-11 01:17:20 +0300 |
commit | 8c8e9b55864e9cf261da5f156d2866236b212a88 (patch) | |
tree | 3273c97edc53bdb3e713d4e91f952c32f5a2a8ce /source/blender | |
parent | 1d230240143a465a197df32754d7c56fab44073a (diff) |
DRW: Deprecate / Remove DRW_STATE_STIPPLE_*
This was unused and used the old drawing paradygm
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 6 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_common.c | 1 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 27 |
3 files changed, 3 insertions, 31 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index d3d4a35cf18..519c907a6a4 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -283,9 +283,9 @@ typedef enum { DRW_STATE_CULL_FRONT = (1 << 9), DRW_STATE_WIRE = (1 << 10), DRW_STATE_POINT = (1 << 11), - DRW_STATE_STIPPLE_2 = (1 << 12), - DRW_STATE_STIPPLE_3 = (1 << 13), - DRW_STATE_STIPPLE_4 = (1 << 14), + /* DRW_STATE_STIPPLE_2 = (1 << 12), */ /* Not used */ + /* DRW_STATE_STIPPLE_3 = (1 << 13), */ /* Not used */ + /* DRW_STATE_STIPPLE_4 = (1 << 14), */ /* Not used */ DRW_STATE_BLEND = (1 << 15), DRW_STATE_ADDITIVE = (1 << 16), DRW_STATE_MULTIPLY = (1 << 17), diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 09134f139a7..e3fde3d8a5d 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -370,7 +370,6 @@ DRWShadingGroup *shgroup_instance_screenspace(DRWPass *pass, struct GPUBatch *ge DRW_shgroup_uniform_float(grp, "size", size, 1); DRW_shgroup_uniform_float(grp, "pixel_size", DRW_viewport_pixelsize_get(), 1); DRW_shgroup_uniform_vec3(grp, "screen_vecs[0]", DRW_viewport_screenvecs_get(), 2); - DRW_shgroup_state_enable(grp, DRW_STATE_STIPPLE_3); return grp; } diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 65f3f38c0f1..8eefd058719 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -282,33 +282,6 @@ void drw_state_set(DRWState state) } } - /* Line Stipple */ - { - int test; - if (CHANGED_ANY_STORE_VAR( - DRW_STATE_STIPPLE_2 | DRW_STATE_STIPPLE_3 | DRW_STATE_STIPPLE_4, - test)) - { - if (test) { - if ((state & DRW_STATE_STIPPLE_2) != 0) { - setlinestyle(2); - } - else if ((state & DRW_STATE_STIPPLE_3) != 0) { - setlinestyle(3); - } - else if ((state & DRW_STATE_STIPPLE_4) != 0) { - setlinestyle(4); - } - else { - BLI_assert(0); - } - } - else { - setlinestyle(0); - } - } - } - /* Stencil */ { DRWState test; |