diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-24 08:09:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-24 08:09:46 +0300 |
commit | 16694ed408a533fcf275db8f92a5d0c7c0cbd854 (patch) | |
tree | 98ff1da567ee52d58cadf455e443d99536437c1f /source/blender/draw | |
parent | 79f67acccb36fd67f534b75f1d0f7e0799080c24 (diff) |
Cleanup: redundant use of string formatting functions
Diffstat (limited to 'source/blender/draw')
5 files changed, 43 insertions, 43 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 6b395660401..15b3457874d 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -274,58 +274,58 @@ static char *eevee_get_defines(int options) char *str = NULL; DynStr *ds = BLI_dynstr_new(); - BLI_dynstr_appendf(ds, SHADER_DEFINES); + BLI_dynstr_append(ds, SHADER_DEFINES); if ((options & VAR_MAT_MESH) != 0) { - BLI_dynstr_appendf(ds, "#define MESH_SHADER\n"); + BLI_dynstr_append(ds, "#define MESH_SHADER\n"); } if ((options & VAR_MAT_HAIR) != 0) { - BLI_dynstr_appendf(ds, "#define HAIR_SHADER\n"); + BLI_dynstr_append(ds, "#define HAIR_SHADER\n"); } if ((options & VAR_MAT_PROBE) != 0) { - BLI_dynstr_appendf(ds, "#define PROBE_CAPTURE\n"); + BLI_dynstr_append(ds, "#define PROBE_CAPTURE\n"); } if ((options & VAR_MAT_FLAT) != 0) { - BLI_dynstr_appendf(ds, "#define USE_FLAT_NORMAL\n"); + BLI_dynstr_append(ds, "#define USE_FLAT_NORMAL\n"); } if ((options & VAR_MAT_CLIP) != 0) { - BLI_dynstr_appendf(ds, "#define USE_ALPHA_CLIP\n"); + BLI_dynstr_append(ds, "#define USE_ALPHA_CLIP\n"); } if ((options & VAR_MAT_SHADOW) != 0) { - BLI_dynstr_appendf(ds, "#define SHADOW_SHADER\n"); + BLI_dynstr_append(ds, "#define SHADOW_SHADER\n"); } if ((options & VAR_MAT_HASH) != 0) { - BLI_dynstr_appendf(ds, "#define USE_ALPHA_HASH\n"); + BLI_dynstr_append(ds, "#define USE_ALPHA_HASH\n"); } if ((options & VAR_MAT_BLEND) != 0) { - BLI_dynstr_appendf(ds, "#define USE_ALPHA_BLEND\n"); + BLI_dynstr_append(ds, "#define USE_ALPHA_BLEND\n"); } if ((options & VAR_MAT_MULT) != 0) { - BLI_dynstr_appendf(ds, "#define USE_MULTIPLY\n"); + BLI_dynstr_append(ds, "#define USE_MULTIPLY\n"); } if ((options & VAR_MAT_REFRACT) != 0) { - BLI_dynstr_appendf(ds, "#define USE_REFRACTION\n"); + BLI_dynstr_append(ds, "#define USE_REFRACTION\n"); } if ((options & VAR_MAT_SSS) != 0) { - BLI_dynstr_appendf(ds, "#define USE_SSS\n"); + BLI_dynstr_append(ds, "#define USE_SSS\n"); } if ((options & VAR_MAT_SSSALBED) != 0) { - BLI_dynstr_appendf(ds, "#define USE_SSS_ALBEDO\n"); + BLI_dynstr_append(ds, "#define USE_SSS_ALBEDO\n"); } if ((options & VAR_MAT_TRANSLUC) != 0) { - BLI_dynstr_appendf(ds, "#define USE_TRANSLUCENCY\n"); + BLI_dynstr_append(ds, "#define USE_TRANSLUCENCY\n"); } if ((options & VAR_MAT_VSM) != 0) { - BLI_dynstr_appendf(ds, "#define SHADOW_VSM\n"); + BLI_dynstr_append(ds, "#define SHADOW_VSM\n"); } if ((options & VAR_MAT_ESM) != 0) { - BLI_dynstr_appendf(ds, "#define SHADOW_ESM\n"); + BLI_dynstr_append(ds, "#define SHADOW_ESM\n"); } if (((options & VAR_MAT_VOLUME) != 0) && ((options & VAR_MAT_BLEND) != 0)) { - BLI_dynstr_appendf(ds, "#define USE_ALPHA_BLEND_VOLUMETRICS\n"); + BLI_dynstr_append(ds, "#define USE_ALPHA_BLEND_VOLUMETRICS\n"); } if ((options & VAR_MAT_LOOKDEV) != 0) { - BLI_dynstr_appendf(ds, "#define LOOKDEV\n"); + BLI_dynstr_append(ds, "#define LOOKDEV\n"); } str = BLI_dynstr_get_cstring(ds); @@ -339,11 +339,11 @@ static char *eevee_get_volume_defines(int options) char *str = NULL; DynStr *ds = BLI_dynstr_new(); - BLI_dynstr_appendf(ds, SHADER_DEFINES); - BLI_dynstr_appendf(ds, "#define VOLUMETRICS\n"); + BLI_dynstr_append(ds, SHADER_DEFINES); + BLI_dynstr_append(ds, "#define VOLUMETRICS\n"); if ((options & VAR_MAT_VOLUME) != 0) { - BLI_dynstr_appendf(ds, "#define MESH_SHADER\n"); + BLI_dynstr_append(ds, "#define MESH_SHADER\n"); } str = BLI_dynstr_get_cstring(ds); diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index fe8d35f1d79..f044d68ddb2 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -74,19 +74,19 @@ static struct GPUShader *eevee_effects_screen_raytrace_shader_get(int options) datatoc_effect_ssr_frag_glsl); DynStr *ds_defines = BLI_dynstr_new(); - BLI_dynstr_appendf(ds_defines, SHADER_DEFINES); + BLI_dynstr_append(ds_defines, SHADER_DEFINES); if (options & SSR_RESOLVE) { - BLI_dynstr_appendf(ds_defines, "#define STEP_RESOLVE\n"); + BLI_dynstr_append(ds_defines, "#define STEP_RESOLVE\n"); } else { - BLI_dynstr_appendf(ds_defines, "#define STEP_RAYTRACE\n"); - BLI_dynstr_appendf(ds_defines, "#define PLANAR_PROBE_RAYTRACE\n"); + BLI_dynstr_append(ds_defines, "#define STEP_RAYTRACE\n"); + BLI_dynstr_append(ds_defines, "#define PLANAR_PROBE_RAYTRACE\n"); } if (options & SSR_FULL_TRACE) { - BLI_dynstr_appendf(ds_defines, "#define FULLRES\n"); + BLI_dynstr_append(ds_defines, "#define FULLRES\n"); } if (options & SSR_AO) { - BLI_dynstr_appendf(ds_defines, "#define SSR_AO\n"); + BLI_dynstr_append(ds_defines, "#define SSR_AO\n"); } char *ssr_define_str = BLI_dynstr_get_cstring(ds_defines); BLI_dynstr_free(ds_defines); diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 8ddcbd2e283..2cec691a62f 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -92,43 +92,43 @@ char *workbench_material_build_defines(WORKBENCH_PrivateData *wpd, bool use_text DynStr *ds = BLI_dynstr_new(); if (wpd->shading.flag & V3D_SHADING_OBJECT_OUTLINE) { - BLI_dynstr_appendf(ds, "#define V3D_SHADING_OBJECT_OUTLINE\n"); + BLI_dynstr_append(ds, "#define V3D_SHADING_OBJECT_OUTLINE\n"); } if (wpd->shading.flag & V3D_SHADING_SHADOW) { - BLI_dynstr_appendf(ds, "#define V3D_SHADING_SHADOW\n"); + BLI_dynstr_append(ds, "#define V3D_SHADING_SHADOW\n"); } if (SSAO_ENABLED(wpd) || CURVATURE_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define WB_CAVITY\n"); + BLI_dynstr_append(ds, "#define WB_CAVITY\n"); } if (SPECULAR_HIGHLIGHT_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define V3D_SHADING_SPECULAR_HIGHLIGHT\n"); + BLI_dynstr_append(ds, "#define V3D_SHADING_SPECULAR_HIGHLIGHT\n"); } if (STUDIOLIGHT_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_STUDIO\n"); + BLI_dynstr_append(ds, "#define V3D_LIGHTING_STUDIO\n"); } if (FLAT_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_FLAT\n"); + BLI_dynstr_append(ds, "#define V3D_LIGHTING_FLAT\n"); } if (MATCAP_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_MATCAP\n"); + BLI_dynstr_append(ds, "#define V3D_LIGHTING_MATCAP\n"); } if (OBJECT_ID_PASS_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define OBJECT_ID_PASS_ENABLED\n"); + BLI_dynstr_append(ds, "#define OBJECT_ID_PASS_ENABLED\n"); } if (MATDATA_PASS_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define MATDATA_PASS_ENABLED\n"); + BLI_dynstr_append(ds, "#define MATDATA_PASS_ENABLED\n"); } if (NORMAL_VIEWPORT_PASS_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define NORMAL_VIEWPORT_PASS_ENABLED\n"); + BLI_dynstr_append(ds, "#define NORMAL_VIEWPORT_PASS_ENABLED\n"); } if (use_textures) { - BLI_dynstr_appendf(ds, "#define V3D_SHADING_TEXTURE_COLOR\n"); + BLI_dynstr_append(ds, "#define V3D_SHADING_TEXTURE_COLOR\n"); } if (NORMAL_ENCODING_ENABLED()) { - BLI_dynstr_appendf(ds, "#define WORKBENCH_ENCODE_NORMALS\n"); + BLI_dynstr_append(ds, "#define WORKBENCH_ENCODE_NORMALS\n"); } if (is_hair) { - BLI_dynstr_appendf(ds, "#define HAIR_SHADER\n"); + BLI_dynstr_append(ds, "#define HAIR_SHADER\n"); } str = BLI_dynstr_get_cstring(ds); diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c index 2c940f9bab8..def425e3c7c 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.c +++ b/source/blender/draw/intern/draw_cache_impl_particles.c @@ -922,7 +922,7 @@ static void particle_batch_cache_ensure_procedural_strand_data( BLI_snprintf(cache->uv_layer_names[i][n++], MAX_LAYER_NAME_LEN, "a%u", hash); if (i == active_uv) { - BLI_snprintf(cache->uv_layer_names[i][n], MAX_LAYER_NAME_LEN, "u"); + BLI_strncpy(cache->uv_layer_names[i][n], "u", MAX_LAYER_NAME_LEN); } } /* Vertex colors */ @@ -942,7 +942,7 @@ static void particle_batch_cache_ensure_procedural_strand_data( } if (i == active_col) { - BLI_snprintf(cache->col_layer_names[i][n], MAX_LAYER_NAME_LEN, "c"); + BLI_strncpy(cache->col_layer_names[i][n], "c", MAX_LAYER_NAME_LEN); } } diff --git a/source/blender/draw/intern/draw_manager_profiling.c b/source/blender/draw/intern/draw_manager_profiling.c index 1ce0a92c978..03811688982 100644 --- a/source/blender/draw/intern/draw_manager_profiling.c +++ b/source/blender/draw/intern/draw_manager_profiling.c @@ -317,7 +317,7 @@ void DRW_stats_draw(rcti *rect) v += 1; /* GPU Timings */ - BLI_snprintf(stat_string, sizeof(stat_string), "GPU Render Timings"); + BLI_strncpy(stat_string, "GPU Render Timings", sizeof(stat_string)); draw_stat(rect, 0, v++, stat_string, sizeof(stat_string)); for (int i = 0; i < DTP.timer_increment; ++i) { |