archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

DRW: Add new per drawcall option to bypass culling.

Browse Source
This commit is contained in:
Clément Foucault
2018-05-28 14:20:58 +02:00
parent 201952aed2
commit ec6da3d72e
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/intern/DRW_render.h
View File

@@ -344,10 +344,12 @@ void DRW_shgroup_instance_batch(DRWShadingGroup *shgroup, struct Gwn_Batch *batc
void DRW_shgroup_free(struct DRWShadingGroup *shgroup); void DRW_shgroup_free(struct DRWShadingGroup *shgroup);
void DRW_shgroup_call_add(DRWShadingGroup *shgroup, struct Gwn_Batch *geom, float (*obmat)[4]); void DRW_shgroup_call_add(DRWShadingGroup *shgroup, struct Gwn_Batch *geom, float (*obmat)[4]);
void DRW_shgroup_call_object_add(DRWShadingGroup *shgroup, struct Gwn_Batch *geom, struct Object *ob);
void DRW_shgroup_call_procedural_points_add(DRWShadingGroup *shgroup, unsigned int point_count, float (*obmat)[4]); void DRW_shgroup_call_procedural_points_add(DRWShadingGroup *shgroup, unsigned int point_count, float (*obmat)[4]);
void DRW_shgroup_call_procedural_lines_add(DRWShadingGroup *shgroup, unsigned int line_count, float (*obmat)[4]); void DRW_shgroup_call_procedural_lines_add(DRWShadingGroup *shgroup, unsigned int line_count, float (*obmat)[4]);
void DRW_shgroup_call_procedural_triangles_add(DRWShadingGroup *shgroup, unsigned int tria_count, float (*obmat)[4]); void DRW_shgroup_call_procedural_triangles_add(DRWShadingGroup *shgroup, unsigned int tria_count, float (*obmat)[4]);
void DRW_shgroup_call_object_add_ex(DRWShadingGroup *shgroup, struct Gwn_Batch *geom, struct Object *ob, bool bypass_culling);
#define DRW_shgroup_call_object_add(shgroup, geom, ob) DRW_shgroup_call_object_add_ex(shgroup, geom, ob, false)
#define DRW_shgroup_call_object_add_no_cull(shgroup, geom, ob) DRW_shgroup_call_object_add_ex(shgroup, geom, ob, true)
void DRW_shgroup_call_object_add_with_callback( void DRW_shgroup_call_object_add_with_callback(
DRWShadingGroup *shgroup, struct Gwn_Batch *geom, struct Object *ob, DRWShadingGroup *shgroup, struct Gwn_Batch *geom, struct Object *ob,
DRWCallVisibilityFn *callback, void *user_data); DRWCallVisibilityFn *callback, void *user_data);

1
source/blender/draw/intern/draw_manager.h
View File

@@ -87,6 +87,7 @@
enum { enum {
DRW_CALL_CULLED = (1 << 0), DRW_CALL_CULLED = (1 << 0),
DRW_CALL_NEGSCALE = (1 << 1), DRW_CALL_NEGSCALE = (1 << 1),
DRW_CALL_BYPASS_CULLING = (1 << 2),
}; };
/* Used by DRWCallState.matflag */ /* Used by DRWCallState.matflag */

4
source/blender/draw/intern/draw_manager_data.c
View File

@@ -400,7 +400,7 @@ void DRW_shgroup_call_procedural_triangles_add(DRWShadingGroup *shgroup, unsigne
/* These calls can be culled and are optimized for redraw */ /* These calls can be culled and are optimized for redraw */
void DRW_shgroup_call_object_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, Object *ob) void DRW_shgroup_call_object_add_ex(DRWShadingGroup *shgroup, Gwn_Batch *geom, Object *ob, bool bypass_culling)
{ {
BLI_assert(geom != NULL); BLI_assert(geom != NULL);
BLI_assert(shgroup->type == DRW_SHG_NORMAL); BLI_assert(shgroup->type == DRW_SHG_NORMAL);
@@ -413,6 +413,8 @@ void DRW_shgroup_call_object_add(DRWShadingGroup *shgroup, Gwn_Batch *geom, Obje
call->select_id = DST.select_id; call->select_id = DST.select_id;
#endif #endif
SET_FLAG_FROM_TEST(call->state->flag, bypass_culling, DRW_CALL_BYPASS_CULLING);
BLI_LINKS_APPEND(&shgroup->calls, call); BLI_LINKS_APPEND(&shgroup->calls, call);
} }

8
source/blender/draw/intern/draw_manager_exec.c
View File

@@ -747,7 +747,8 @@ static void draw_matrices_model_prepare(DRWCallState *st)
} }
/* No need to go further the call will not be used. */ /* No need to go further the call will not be used. */
if (st->flag & DRW_CALL_CULLED) if ((st->flag & DRW_CALL_CULLED) != 0 &&
(st->flag & DRW_CALL_BYPASS_CULLING) == 0)
return; return;
/* Order matters */ /* Order matters */
@@ -1119,8 +1120,11 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
draw_visibility_eval(call->state); draw_visibility_eval(call->state);
draw_matrices_model_prepare(call->state); draw_matrices_model_prepare(call->state);
if ((call->state->flag & DRW_CALL_CULLED) != 0) if ((call->state->flag & DRW_CALL_CULLED) != 0 &&
(call->state->flag & DRW_CALL_BYPASS_CULLING) == 0)
{
continue; continue;
}
/* XXX small exception/optimisation for outline rendering. */ /* XXX small exception/optimisation for outline rendering. */
if (shgroup->callid != -1) { if (shgroup->callid != -1) {