diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 13:18:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 13:18:04 +0300 |
| commit | b4d053efc75424fca4b413ac1bc7a7e826fac629 (patch) | |
| tree | 80647d9ca9109e997fce9911f202f98d7f8577d4 /source/blender/blenkernel/intern/pbvh.c | |
| parent | 349946bd010b1112b13c8594aabfb318c330bc0d (diff) | |
Gawain API naming refactor
Use consistent prefix for gawain API names as well as
some abbreviations to avoid over-long names, see: D2678
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 336d4fae1b8..ef2eaf8405b 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1159,7 +1159,7 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) static void pbvh_draw_BB(PBVH *bvh) { - unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 3, KEEP_FLOAT); + unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 3, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); for (int a = 0; a < bvh->totnode; a++) { @@ -1849,7 +1849,7 @@ void BKE_pbvh_draw(PBVH *bvh, float (*planes)[4], float (*fnors)[3], struct PBVHNodeDrawCallbackData { - void (*draw_fn)(void *user_data, Batch *batch); + void (*draw_fn)(void *user_data, Gwn_Batch *batch); void *user_data; bool fast; }; @@ -1859,7 +1859,7 @@ static void pbvh_node_draw_cb(PBVHNode *node, void *data_v) struct PBVHNodeDrawCallbackData *data = data_v; if (!(node->flag & PBVH_FullyHidden)) { - Batch *triangles = GPU_pbvh_buffers_batch_get(node->draw_buffers, data->fast); + Gwn_Batch *triangles = GPU_pbvh_buffers_batch_get(node->draw_buffers, data->fast); if (triangles != NULL) { data->draw_fn(data->user_data, triangles); } @@ -1871,7 +1871,7 @@ static void pbvh_node_draw_cb(PBVHNode *node, void *data_v) */ void BKE_pbvh_draw_cb( PBVH *bvh, float (*planes)[4], float (*fnors)[3], bool fast, - void (*draw_fn)(void *user_data, Batch *batch), void *user_data) + void (*draw_fn)(void *user_data, Gwn_Batch *batch), void *user_data) { struct PBVHNodeDrawCallbackData draw_data = { .fast = fast, |