From dfd8a52cd2e83b350e75cf69ee96d347e921ce26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Fri, 9 Mar 2018 23:49:08 +0100 Subject: DRW: Change clip planes API. The draw manager now just set the number of active clip planes. It's now up to the engine to specify the plane equations as uniform/ubo/constant. --- source/blender/draw/intern/DRW_render.h | 2 +- source/blender/draw/intern/draw_manager_exec.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/draw/intern') diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 7a8fc5ff3c1..cca08f8da9b 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -480,7 +480,7 @@ void DRW_state_lock(DRWState state); void DRW_state_invert_facing(void); -void DRW_state_clip_planes_add(float plane_eq[4]); +void DRW_state_clip_planes_count_set(unsigned int plane_ct); void DRW_state_clip_planes_reset(void); /* Culling, return true if object is inside view frustum. */ diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 49bb9f114a7..f53631e7e54 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -366,10 +366,10 @@ void DRW_state_invert_facing(void) * and if the shaders have support for it (see usage of gl_ClipDistance). * Be sure to call DRW_state_clip_planes_reset() after you finish drawing. **/ -void DRW_state_clip_planes_add(float plane_eq[4]) +void DRW_state_clip_planes_count_set(unsigned int plane_ct) { - BLI_assert(DST.num_clip_planes < MAX_CLIP_PLANES-1); - // copy_v4_v4(DST.view_data.clip_planes_eq[DST.num_clip_planes++], plane_eq); + BLI_assert(plane_ct <= MAX_CLIP_PLANES); + DST.num_clip_planes = plane_ct; } void DRW_state_clip_planes_reset(void) -- cgit v1.2.3