From c1c53d3ae31ad1b2c0b16077e53574d20390ae84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Mon, 14 Sep 2020 01:07:05 +0200 Subject: Cleanup: DRWManager: Remove deprecated pass_state functions And also enable pass names when using `--debug-gpu` option. --- source/blender/draw/intern/DRW_render.h | 4 ---- source/blender/draw/intern/draw_manager_data.c | 17 +---------------- 2 files changed, 1 insertion(+), 20 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 30c6f0ad4dc..2744c55a231 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -581,10 +581,6 @@ bool DRW_shgroup_is_empty(DRWShadingGroup *shgroup); DRWPass *DRW_pass_create(const char *name, DRWState state); DRWPass *DRW_pass_create_instance(const char *name, DRWPass *original, DRWState state); void DRW_pass_link(DRWPass *first, DRWPass *second); -/* TODO Replace with passes inheritance. */ -void DRW_pass_state_set(DRWPass *pass, DRWState state); -void DRW_pass_state_add(DRWPass *pass, DRWState state); -void DRW_pass_state_remove(DRWPass *pass, DRWState state); void DRW_pass_foreach_shgroup(DRWPass *pass, void (*callback)(void *userData, DRWShadingGroup *shgroup), void *userData); diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index ca5d5170262..7fe3bc0f071 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1947,7 +1947,7 @@ DRWPass *DRW_pass_create(const char *name, DRWState state) { DRWPass *pass = BLI_memblock_alloc(DST.vmempool->passes); pass->state = state | DRW_STATE_PROGRAM_POINT_SIZE; - if (((G.debug_value > 20) && (G.debug_value < 30)) || (G.debug & G_DEBUG)) { + if (G.debug & G_DEBUG_GPU) { BLI_strncpy(pass->name, name, MAX_PASS_NAME); } @@ -1994,21 +1994,6 @@ bool DRW_pass_is_empty(DRWPass *pass) return true; } -void DRW_pass_state_set(DRWPass *pass, DRWState state) -{ - pass->state = state | DRW_STATE_PROGRAM_POINT_SIZE; -} - -void DRW_pass_state_add(DRWPass *pass, DRWState state) -{ - pass->state |= state; -} - -void DRW_pass_state_remove(DRWPass *pass, DRWState state) -{ - pass->state &= ~state; -} - void DRW_pass_foreach_shgroup(DRWPass *pass, void (*callback)(void *userData, DRWShadingGroup *shgrp), void *userData) -- cgit v1.2.3