diff options
author | YimingWu <xp8110@outlook.com> | 2019-05-16 05:03:21 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-05-16 05:03:21 +0300 |
commit | 46866fb907b9379b35522d877e97cea1f230d4b8 (patch) | |
tree | c8296b7db251ace82be67da6736b35b6d3d61d7b /source/blender | |
parent | 54804117e89931a1e7bfa67b2aaf4fe237881ab6 (diff) |
Solve merge errors in shader calls.soc-2018-npr
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_engine.c | 14 | ||||
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_ops.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_snake.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c index a8d5f95ceab..c66d7011dc1 100644 --- a/source/blender/draw/engines/lanpr/lanpr_engine.c +++ b/source/blender/draw/engines/lanpr/lanpr_engine.c @@ -241,13 +241,13 @@ static void lanpr_cache_init(void *vedata){ DRW_shgroup_uniform_float(stl->g_data->edge_detect_shgrp, "normal_strength", &stl->g_data->normal_strength, 1);// normal strength DRW_shgroup_uniform_float(stl->g_data->edge_detect_shgrp, "depth_clamp", &stl->g_data->depth_clamp, 1);// depth clamp DRW_shgroup_uniform_float(stl->g_data->edge_detect_shgrp, "depth_strength", &stl->g_data->depth_strength, 1);// depth strength - DRW_shgroup_call_add(stl->g_data->edge_detect_shgrp, quad, NULL); + DRW_shgroup_call(stl->g_data->edge_detect_shgrp, quad, NULL); psl->edge_thinning = DRW_pass_create("Edge Thinning Stage 1", DRW_STATE_WRITE_COLOR); stl->g_data->edge_thinning_shgrp = DRW_shgroup_create(lanpr_share.edge_thinning_shader, psl->edge_thinning); DRW_shgroup_uniform_texture_ref(stl->g_data->edge_thinning_shgrp, "tex_sample_0", &dtxl->color); DRW_shgroup_uniform_int(stl->g_data->edge_thinning_shgrp, "stage", &stl->g_data->stage, 1); - DRW_shgroup_call_add(stl->g_data->edge_thinning_shgrp, quad, NULL); + DRW_shgroup_call(stl->g_data->edge_thinning_shgrp, quad, NULL); } elif(lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->active_layer) @@ -345,7 +345,7 @@ static void lanpr_cache_populate(void *vedata, Object *ob){ struct GPUBatch *geom = DRW_cache_object_surface_get(ob); if (geom) { - DRW_shgroup_call_object_add_no_cull(stl->g_data->multipass_shgrp, geom, ob); + DRW_shgroup_call_object_no_cull(stl->g_data->multipass_shgrp, geom, ob); } if (lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->active_layer) { @@ -393,13 +393,13 @@ static void lanpr_cache_finish(void *vedata){ LANPR_BatchItem *bi; for (bi = pd->dpix_batch_list.first; bi; bi = (void *)bi->Item.next) { - DRW_shgroup_call_add(pd->dpix_transform_shgrp, bi->dpix_transform_batch, bi->ob->obmat); - DRW_shgroup_call_add(pd->dpix_preview_shgrp, bi->dpix_preview_batch, 0); + DRW_shgroup_call(pd->dpix_transform_shgrp, bi->dpix_transform_batch, bi->ob->obmat); + DRW_shgroup_call(pd->dpix_preview_shgrp, bi->dpix_preview_batch, 0); } if (lanpr->render_buffer && lanpr->render_buffer->DPIXIntersectionBatch) { - DRW_shgroup_call_add(pd->dpix_transform_shgrp, lanpr->render_buffer->DPIXIntersectionTransformBatch, 0); - DRW_shgroup_call_add(pd->dpix_preview_shgrp, lanpr->render_buffer->DPIXIntersectionBatch, 0); + DRW_shgroup_call(pd->dpix_transform_shgrp, lanpr->render_buffer->DPIXIntersectionTransformBatch, 0); + DRW_shgroup_call(pd->dpix_preview_shgrp, lanpr->render_buffer->DPIXIntersectionBatch, 0); } } } diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c index 104a881505c..c94669745d5 100644 --- a/source/blender/draw/engines/lanpr/lanpr_ops.c +++ b/source/blender/draw/engines/lanpr/lanpr_ops.c @@ -3308,7 +3308,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render) DRW_shgroup_uniform_float(rb->ChainShgrp, "taper_r_strength", lanpr->use_same_taper ? tls : trs, 1); //need to add component enable/disable option. - DRW_shgroup_call_add(rb->ChainShgrp, lanpr->render_buffer->ChainDrawBatch, NULL); + DRW_shgroup_call(rb->ChainShgrp, lanpr->render_buffer->ChainDrawBatch, NULL); // debug purpose //DRW_draw_pass(psl->color_pass); //DRW_draw_pass(psl->color_pass); @@ -3344,7 +3344,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render) DRW_shgroup_uniform_float(ll->shgrp, "normal_thickness_end", &ll->normal_thickness_end, 1); DRW_shgroup_uniform_vec3(ll->shgrp, "normal_direction", normal_object_direction, 1); - DRW_shgroup_call_add(ll->shgrp, ll->batch, NULL); + DRW_shgroup_call(ll->shgrp, ll->batch, NULL); DRW_draw_pass(psl->software_pass); } } diff --git a/source/blender/draw/engines/lanpr/lanpr_snake.c b/source/blender/draw/engines/lanpr/lanpr_snake.c index f916578a25b..76f754333be 100644 --- a/source/blender/draw/engines/lanpr/lanpr_snake.c +++ b/source/blender/draw/engines/lanpr/lanpr_snake.c @@ -470,7 +470,7 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, DRW_shgroup_uniform_float(pd->snake_shgrp, "taper_r_strength", lanpr->use_same_taper ? tls : trs, 1); DRW_shgroup_uniform_vec4(pd->snake_shgrp, "line_color", lanpr->line_color, 1); - DRW_shgroup_call_add(pd->snake_shgrp, snake_batch, NULL); + DRW_shgroup_call(pd->snake_shgrp, snake_batch, NULL); GPU_framebuffer_bind(fbl->edge_intermediate); DRW_draw_pass(psl->snake_pass); |