From 6470056a0d1ed1a07c823d46ea292d69d3c2a8fb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 2 Apr 2019 17:54:04 +1100 Subject: Cleanup: empty expression statement warning --- source/blender/draw/engines/eevee/eevee_effects.c | 4 ++-- source/blender/draw/engines/eevee/eevee_lightcache.c | 10 +++++----- source/blender/draw/engines/eevee/eevee_render.c | 2 +- source/blender/draw/engines/gpencil/gpencil_engine.h | 4 ++-- source/blender/draw/intern/DRW_render.h | 4 ++-- source/blender/draw/intern/draw_anim_viz.c | 2 +- source/blender/draw/intern/draw_cache.c | 7 ++++--- source/blender/draw/intern/draw_manager.c | 4 ++-- source/blender/draw/intern/draw_view.c | 2 +- source/blender/draw/modes/edit_curve_mode.c | 4 ++-- source/blender/draw/modes/edit_lattice_mode.c | 2 +- source/blender/draw/modes/object_mode.c | 2 +- 12 files changed, 24 insertions(+), 23 deletions(-) (limited to 'source/blender/draw') diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 9de01bf140b..e276fcd63ce 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -119,14 +119,14 @@ static void eevee_create_shader_downsample(void) GPU_ATTACHMENT_NONE, \ GPU_ATTACHMENT_TEXTURE(tex), \ }); \ -} +} ((void)0) #define CLEANUP_BUFFER(tex, fb, fb_color) { \ /* Cleanup to release memory */ \ DRW_TEXTURE_FREE_SAFE(tex); \ GPU_FRAMEBUFFER_FREE_SAFE(fb); \ GPU_FRAMEBUFFER_FREE_SAFE(fb_color); \ -} +} ((void)0) void EEVEE_effects_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, Object *camera, const bool minimal) { diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index d5c322356d8..812af1c6ac0 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -984,15 +984,15 @@ static bool eevee_lightbake_cube_comp(EEVEE_LightProbe *prb_a, EEVEE_LightProbe bool sorted = false; \ while (!sorted) { \ sorted = true; \ - for (int i = 0; i < (elems_len) - 1; ++i) { \ - if ((comp_fn)((elems) + i, (elems) + i+1)) { \ - SWAP(elems_type, (elems)[i], (elems)[i+1]); \ - SWAP(LightProbe *, (prbs)[i], (prbs)[i+1]); \ + for (int i = 0; i < (elems_len) - 1; i++) { \ + if ((comp_fn)((elems) + i, (elems) + i + 1)) { \ + SWAP(elems_type, (elems)[i], (elems)[i + 1]); \ + SWAP(LightProbe *, (prbs)[i], (prbs)[i + 1]); \ sorted = false; \ } \ } \ } \ -} +} ((void)0) static void eevee_lightbake_gather_probes(EEVEE_LightBake *lbake) { diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index 07be0ad750d..e563fa8b9ce 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -616,7 +616,7 @@ void EEVEE_render_update_passes(RenderEngine *engine, Scene *scene, ViewLayer *v else if (channels == 3) type = SOCK_VECTOR; \ else type = SOCK_FLOAT; \ RE_engine_register_pass(engine, scene, view_layer, RE_PASSNAME_ ## name, channels, chanid, type); \ - } + } ((void)0) CHECK_PASS(Z, 1, "Z"); CHECK_PASS(MIST, 1, "Z"); diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h index 860dd728805..8af74ec7451 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.h +++ b/source/blender/draw/engines/gpencil/gpencil_engine.h @@ -459,7 +459,7 @@ void GPENCIL_render_to_image(void *vedata, struct RenderEngine *engine, struct R GPU_framebuffer_clear_color_depth(fbl->multisample_fb, (const float[4]){0.0f}, 1.0f); \ DRW_stats_query_end(); \ } \ -} +} ((void)0) #define MULTISAMPLE_GP_SYNC_DISABLE(lvl, fbl, fb, txl) { \ if ((lvl > 0) && (fbl->multisample_fb != NULL)) { \ @@ -468,7 +468,7 @@ void GPENCIL_render_to_image(void *vedata, struct RenderEngine *engine, struct R DRW_multisamples_resolve(txl->multisample_depth, txl->multisample_color, true); \ DRW_stats_query_end(); \ } \ -} +} ((void)0) #define GPENCIL_3D_DRAWMODE(ob, gpd) \ ((gpd) && (gpd->draw_mode == GP_DRAWMODE_3D) && \ diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 5c505f1b234..3d4618021e8 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -120,7 +120,7 @@ typedef char DRWViewportEmptyList; DRW_multisamples_resolve(dtxl->multisample_depth, dtxl->multisample_color, true); \ DRW_stats_query_end(); \ } \ -} +} ((void)0) #define MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl) { \ if (dfbl->multisample_fb != NULL) { \ @@ -129,7 +129,7 @@ typedef char DRWViewportEmptyList; DRW_multisamples_resolve(dtxl->multisample_depth, dtxl->multisample_color, false); \ DRW_stats_query_end(); \ } \ -} +} ((void)0) diff --git a/source/blender/draw/intern/draw_anim_viz.c b/source/blender/draw/intern/draw_anim_viz.c index 09625b9b47e..03566de01d2 100644 --- a/source/blender/draw/intern/draw_anim_viz.c +++ b/source/blender/draw/intern/draw_anim_viz.c @@ -309,7 +309,7 @@ static void MPATH_draw_scene(void *vedata) DRW_draw_pass(psl->lines); DRW_draw_pass(psl->points); - MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl) + MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl); } /* *************************** Draw Engine Defines ****************************** */ diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index cdbbcf9ec2b..f369048ec2f 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -2751,9 +2751,10 @@ static const float staticSine[16] = { 0.994521895368f, 1.0f, }; -#define set_vert(a, b, quarter) \ - copy_v2_fl2(pos, (quarter % 2 == 0) ? -(a) : (a), (quarter < 2) ? -(b) : (b)); \ - GPU_vertbuf_attr_set(vbo, attr_id.pos, v++, pos); +#define set_vert(a, b, quarter) { \ + copy_v2_fl2(pos, (quarter % 2 == 0) ? -(a) : (a), (quarter < 2) ? -(b) : (b)); \ + GPU_vertbuf_attr_set(vbo, attr_id.pos, v++, pos); \ + } ((void)0) GPUBatch *DRW_cache_bone_dof_sphere_get(void) { diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 44ec9926d59..66b5ec22af9 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1716,7 +1716,7 @@ bool DRW_render_check_grease_pencil(Depsgraph *depsgraph) } } } - DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END + DEG_OBJECT_ITER_FOR_RENDER_ENGINE_END; return false; } @@ -1959,7 +1959,7 @@ void DRW_render_object_iter( drw_batch_cache_generate_requested(ob); } } - DEG_OBJECT_ITER_END + DEG_OBJECT_ITER_END; } /* Assume a valid gl context is bound (and that the gl_context_mutex has been acquired). diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 71bf37b4e7a..b907452dad2 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -247,7 +247,7 @@ void DRW_draw_cursor(void) #define CURSOR_EDGE(axis_vec, axis, sign) { \ CURSOR_VERT(axis_vec, axis, sign 1.0f); \ CURSOR_VERT(axis_vec, axis, sign 0.25f); \ - } + } ((void)0) for (int axis = 0; axis < 3; axis++) { float axis_vec[3] = {0}; diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index 8c6ea162adc..a1741c7e967 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -305,7 +305,7 @@ static void EDIT_CURVE_draw_scene(void *vedata) DRW_draw_pass(psl->wire_pass); - MULTISAMPLE_SYNC_DISABLE(dfbl, dtxl) + MULTISAMPLE_SYNC_DISABLE(dfbl, dtxl); } /* Unfortunately this pass cannot be AA'd without @@ -318,7 +318,7 @@ static void EDIT_CURVE_draw_scene(void *vedata) DRW_draw_pass(psl->wire_pass_xray); - MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl) + MULTISAMPLE_SYNC_DISABLE_NO_DEPTH(dfbl, dtxl); } /* Thoses passes don't write to depth and are AA'ed using other tricks. */ diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index 9ea76deed3a..3db167fc1fd 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -262,7 +262,7 @@ static void EDIT_LATTICE_draw_scene(void *vedata) DRW_draw_pass(psl->wire_pass); DRW_draw_pass(psl->vert_pass); - MULTISAMPLE_SYNC_DISABLE(dfbl, dtxl) + MULTISAMPLE_SYNC_DISABLE(dfbl, dtxl); /* If you changed framebuffer, double check you rebind * the default one with its textures attached before finishing */ diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 3cb3d28a29c..563d1267885 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -3308,7 +3308,7 @@ static void OBJECT_draw_scene(void *vedata) DRW_draw_pass(psl->particle); DRW_draw_pass(stl->g_data->sgl.bone_axes); - MULTISAMPLE_SYNC_DISABLE(dfbl, dtxl) + MULTISAMPLE_SYNC_DISABLE(dfbl, dtxl); DRW_draw_pass(stl->g_data->sgl.image_empties); -- cgit v1.2.3