From b134434224254d4ac3fc73d023f2f6d914746690 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Aug 2020 22:36:11 +1000 Subject: Cleanup: declare arrays arrays where possible --- source/blender/draw/engines/eevee/eevee_depth_of_field.c | 2 +- source/blender/draw/engines/eevee/eevee_effects.c | 2 +- source/blender/draw/engines/eevee/eevee_engine.c | 4 ++-- source/blender/draw/engines/eevee/eevee_lightcache.c | 2 +- source/blender/draw/engines/eevee/eevee_lightprobes.c | 2 +- source/blender/draw/engines/eevee/eevee_lookdev.c | 2 +- source/blender/draw/engines/eevee/eevee_materials.c | 2 +- source/blender/draw/engines/eevee/eevee_mist.c | 2 +- source/blender/draw/engines/eevee/eevee_motion_blur.c | 12 ++++++++---- source/blender/draw/engines/eevee/eevee_occlusion.c | 4 ++-- source/blender/draw/engines/eevee/eevee_render.c | 10 ++++++---- source/blender/draw/engines/eevee/eevee_sampling.c | 8 ++++---- source/blender/draw/engines/eevee/eevee_screen_raytrace.c | 4 ++-- source/blender/draw/engines/eevee/eevee_shadows.c | 2 +- source/blender/draw/engines/eevee/eevee_shadows_cascade.c | 2 +- source/blender/draw/engines/eevee/eevee_subsurface.c | 6 +++--- source/blender/draw/engines/eevee/eevee_temporal_sampling.c | 2 +- source/blender/draw/engines/eevee/eevee_volumes.c | 8 ++++---- source/blender/draw/engines/external/external_engine.c | 2 +- source/blender/draw/engines/gpencil/gpencil_antialiasing.c | 2 +- source/blender/draw/engines/gpencil/gpencil_cache_utils.c | 2 +- source/blender/draw/engines/gpencil/gpencil_engine.c | 6 +++--- source/blender/draw/engines/gpencil/gpencil_render.c | 2 +- source/blender/draw/engines/overlay/overlay_antialiasing.c | 4 ++-- source/blender/draw/engines/overlay/overlay_armature.c | 2 +- source/blender/draw/engines/overlay/overlay_engine.c | 2 +- source/blender/draw/engines/overlay/overlay_extra.c | 8 ++++---- source/blender/draw/engines/overlay/overlay_image.c | 2 +- source/blender/draw/engines/overlay/overlay_motion_path.c | 4 ++-- source/blender/draw/engines/overlay/overlay_outline.c | 2 +- .../draw/engines/workbench/workbench_effect_antialiasing.c | 2 +- source/blender/draw/engines/workbench/workbench_effect_dof.c | 2 +- source/blender/draw/engines/workbench/workbench_engine.c | 6 +++--- source/blender/draw/engines/workbench/workbench_materials.c | 2 +- source/blender/draw/engines/workbench/workbench_shadow.c | 4 ++-- source/blender/draw/engines/workbench/workbench_volume.c | 4 ++-- 36 files changed, 70 insertions(+), 64 deletions(-) (limited to 'source/blender/draw/engines') diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index 05cd6426911..1d8082538a8 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -261,7 +261,7 @@ void EEVEE_depth_of_field_draw(EEVEE_Data *vedata) /* Depth Of Field */ if ((effects->enabled_effects & EFFECT_DOF) != 0) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Downsample */ GPU_framebuffer_bind(fbl->dof_down_fb); diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index f6e74c6822c..365ba0afaac 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -138,7 +138,7 @@ void EEVEE_effects_init(EEVEE_ViewLayerData *sldata, DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); const float *viewport_size = DRW_viewport_size_get(); - int size_fs[2] = {(int)viewport_size[0], (int)viewport_size[1]}; + const int size_fs[2] = {(int)viewport_size[0], (int)viewport_size[1]}; /* Shaders */ if (!e_data.downsample_sh) { diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index d77c6600026..72f008ea66a 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -217,10 +217,10 @@ static void eevee_draw_scene(void *vedata) } while (loop_len--) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float clear_depth = 1.0f; uint clear_stencil = 0x0; - uint primes[3] = {2, 3, 7}; + const uint primes[3] = {2, 3, 7}; double offset[3] = {0.0, 0.0, 0.0}; double r[3]; diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c index 38f5536170e..cb41d3dbd8d 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.c +++ b/source/blender/draw/engines/eevee/eevee_lightcache.c @@ -863,7 +863,7 @@ static void eevee_lightbake_cache_create(EEVEE_Data *vedata, EEVEE_LightBake *lb /* HACK: set txl->color but unset it before Draw Manager frees it. */ txl->color = lbake->rt_color; - int viewport_size[2] = { + const int viewport_size[2] = { GPU_texture_width(txl->color), GPU_texture_height(txl->color), }; diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 47a913640c7..0f4a9dc79b6 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -1112,7 +1112,7 @@ void EEVEE_lightbake_filter_diffuse(EEVEE_ViewLayerData *sldata, #if defined(IRRADIANCE_SH_L2) int size[2] = {3, 3}; #elif defined(IRRADIANCE_HL2) - int size[2] = {3, 2}; + const int size[2] = {3, 2}; pinfo->samples_len = 1024.0f; #endif diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c index 403a8e2af55..f79d90500bd 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.c +++ b/source/blender/draw/engines/eevee/eevee_lookdev.c @@ -245,7 +245,7 @@ static void eevee_lookdev_apply_taa(const EEVEE_EffectsInfo *effects, if (DRW_state_is_image_render() || ((effects->enabled_effects & EFFECT_TAA) != 0)) { double ht_point[2]; double ht_offset[2] = {0.0, 0.0}; - uint ht_primes[2] = {2, 3}; + const uint ht_primes[2] = {2, 3}; float ofs[2]; BLI_halton_2d(ht_primes, ht_offset, effects->taa_current_sample, ht_point); diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 4f97fe99b27..fb07208be47 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -907,7 +907,7 @@ static void material_renderpass_init(EEVEE_FramebufferList *fbl, DRW_texture_ensure_fullscreen_2d(output_tx, format, 0); /* Clear texture. */ if (do_clear) { - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* TODO(fclem) replace by GPU_texture_clear once it is fast. */ GPU_framebuffer_texture_attach(fbl->material_accum_fb, *output_tx, 0, 0); GPU_framebuffer_bind(fbl->material_accum_fb); diff --git a/source/blender/draw/engines/eevee/eevee_mist.c b/source/blender/draw/engines/eevee/eevee_mist.c index d2f3a13eb7c..cfac6cc4d62 100644 --- a/source/blender/draw/engines/eevee/eevee_mist.c +++ b/source/blender/draw/engines/eevee/eevee_mist.c @@ -53,7 +53,7 @@ void EEVEE_mist_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) EEVEE_PrivateData *g_data = stl->g_data; Scene *scene = draw_ctx->scene; - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; if (e_data.mist_sh == NULL) { DRWShaderLibrary *lib = EEVEE_shader_lib_get(); diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index 4e49136a6bc..2a315927015 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -117,8 +117,10 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda } const float *fs_size = DRW_viewport_size_get(); - int tx_size[2] = {1 + ((int)fs_size[0] / EEVEE_VELOCITY_TILE_SIZE), - 1 + ((int)fs_size[1] / EEVEE_VELOCITY_TILE_SIZE)}; + const int tx_size[2] = { + 1 + ((int)fs_size[0] / EEVEE_VELOCITY_TILE_SIZE), + 1 + ((int)fs_size[1] / EEVEE_VELOCITY_TILE_SIZE), + }; effects->velocity_tiles_x_tx = DRW_texture_pool_query_2d( tx_size[0], fs_size[1], GPU_RGBA16, &draw_engine_eevee_type); @@ -173,8 +175,10 @@ void EEVEE_motion_blur_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat if ((effects->enabled_effects & EFFECT_MOTION_BLUR) != 0) { const float *fs_size = DRW_viewport_size_get(); - int tx_size[2] = {GPU_texture_width(effects->velocity_tiles_tx), - GPU_texture_height(effects->velocity_tiles_tx)}; + const int tx_size[2] = { + GPU_texture_width(effects->velocity_tiles_tx), + GPU_texture_height(effects->velocity_tiles_tx), + }; eevee_motion_blur_sync_camera(vedata); diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c index 1929bbb9b98..9aae801197f 100644 --- a/source/blender/draw/engines/eevee/eevee_occlusion.c +++ b/source/blender/draw/engines/eevee/eevee_occlusion.c @@ -74,7 +74,7 @@ int EEVEE_occlusion_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) const Scene *scene_eval = DEG_get_evaluated_scene(draw_ctx->depsgraph); if (!e_data.dummy_horizon_tx) { - float pixel[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float pixel[4] = {0.0f, 0.0f, 0.0f, 0.0f}; e_data.dummy_horizon_tx = DRW_texture_create_2d(1, 1, GPU_RGBA8, DRW_TEX_WRAP, pixel); } @@ -143,7 +143,7 @@ void EEVEE_occlusion_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata const eGPUTextureFormat texture_format = (tot_samples > 128) ? GPU_R32F : GPU_R16F; DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Should be enough precision for many samples. */ DRW_texture_ensure_fullscreen_2d(&txl->ao_accum, texture_format, 0); diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index b6b8833b1da..62698bc5da3 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -93,8 +93,10 @@ bool EEVEE_render_init(EEVEE_Data *ved, RenderEngine *engine, struct Depsgraph * copy_v4_fl4(camtexcofac, 1.0f, 1.0f, 0.0f, 0.0f); } - int final_res[2] = {size_orig[0] + g_data->overscan_pixels * 2.0f, - size_orig[1] + g_data->overscan_pixels * 2.0f}; + const int final_res[2] = { + size_orig[0] + g_data->overscan_pixels * 2.0f, + size_orig[1] + g_data->overscan_pixels * 2.0f, + }; int max_dim = max_ii(final_res[0], final_res[1]); if (max_dim > GPU_max_texture_size()) { @@ -523,10 +525,10 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl } while (render_samples < tot_sample && !RE_engine_test_break(engine)) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float clear_depth = 1.0f; uint clear_stencil = 0x00; - uint primes[3] = {2, 3, 7}; + const uint primes[3] = {2, 3, 7}; double offset[3] = {0.0, 0.0, 0.0}; double r[3]; diff --git a/source/blender/draw/engines/eevee/eevee_sampling.c b/source/blender/draw/engines/eevee/eevee_sampling.c index 5e951928c5a..253dae79902 100644 --- a/source/blender/draw/engines/eevee/eevee_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_sampling.c @@ -34,7 +34,7 @@ void EEVEE_sample_ball(int sample_ofs, float radius, float rsample[3]) { double ht_point[3]; double ht_offset[3] = {0.0, 0.0, 0.0}; - uint ht_primes[3] = {2, 3, 7}; + const uint ht_primes[3] = {2, 3, 7}; BLI_halton_3d(ht_primes, ht_offset, sample_ofs, ht_point); @@ -65,7 +65,7 @@ void EEVEE_sample_rectangle(int sample_ofs, { double ht_point[2]; double ht_offset[2] = {0.0, 0.0}; - uint ht_primes[2] = {2, 3}; + const uint ht_primes[2] = {2, 3}; BLI_halton_2d(ht_primes, ht_offset, sample_ofs, ht_point); @@ -91,7 +91,7 @@ void EEVEE_sample_ellipse(int sample_ofs, { double ht_point[2]; double ht_offset[2] = {0.0, 0.0}; - uint ht_primes[2] = {2, 3}; + const uint ht_primes[2] = {2, 3}; BLI_halton_2d(ht_primes, ht_offset, sample_ofs, ht_point); @@ -114,7 +114,7 @@ void EEVEE_random_rotation_m4(int sample_ofs, float scale, float r_mat[4][4]) { double ht_point[3]; double ht_offset[3] = {0.0, 0.0, 0.0}; - uint ht_primes[3] = {2, 3, 5}; + const uint ht_primes[3] = {2, 3, 5}; BLI_halton_3d(ht_primes, ht_offset, sample_ofs, ht_point); diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index a1755e60c06..88029c2e940 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -138,7 +138,7 @@ int EEVEE_screen_raytrace_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) const int divisor = (effects->reflection_trace_full) ? 1 : 2; int tracing_res[2] = {(int)viewport_size[0] / divisor, (int)viewport_size[1] / divisor}; - int size_fs[2] = {(int)viewport_size[0], (int)viewport_size[1]}; + const int size_fs[2] = {(int)viewport_size[0], (int)viewport_size[1]}; const bool high_qual_input = true; /* TODO dither low quality input */ const eGPUTextureFormat format = (high_qual_input) ? GPU_RGBA16F : GPU_RGBA8; @@ -330,7 +330,7 @@ void EEVEE_reflection_output_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_StorageList *stl = vedata->stl; EEVEE_EffectsInfo *effects = stl->effects; - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Create FrameBuffer. */ const eGPUTextureFormat texture_format = (tot_samples > 256) ? GPU_RGBA32F : GPU_RGBA16F; diff --git a/source/blender/draw/engines/eevee/eevee_shadows.c b/source/blender/draw/engines/eevee/eevee_shadows.c index 0da356b75ac..71a4da9fcab 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows.c +++ b/source/blender/draw/engines/eevee/eevee_shadows.c @@ -385,7 +385,7 @@ void EEVEE_shadow_output_init(EEVEE_ViewLayerData *sldata, EEVEE_EffectsInfo *effects = stl->effects; DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Create FrameBuffer. */ const eGPUTextureFormat texture_format = GPU_R32F; diff --git a/source/blender/draw/engines/eevee/eevee_shadows_cascade.c b/source/blender/draw/engines/eevee/eevee_shadows_cascade.c index 1fd8d818b33..246bc18b71a 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows_cascade.c +++ b/source/blender/draw/engines/eevee/eevee_shadows_cascade.c @@ -139,7 +139,7 @@ static void eevee_shadow_cascade_setup(EEVEE_LightsInfo *linfo, float jitter_ofs[2]; double ht_point[2]; double ht_offset[2] = {0.0, 0.0}; - uint ht_primes[2] = {2, 3}; + const uint ht_primes[2] = {2, 3}; BLI_halton_2d(ht_primes, ht_offset, sample_ofs, ht_point); diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index 637c5201afc..74fb7ac99b7 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -166,7 +166,7 @@ void EEVEE_subsurface_output_init(EEVEE_ViewLayerData *UNUSED(sldata), * pass in look dev mode active. `texture_created` will make sure that newly created textures * are cleared. */ if (effects->taa_current_sample == 1 || texture_created) { - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; GPU_framebuffer_bind(fbl->sss_accum_fb); GPU_framebuffer_clear_color(fbl->sss_accum_fb, clear); } @@ -282,7 +282,7 @@ void EEVEE_subsurface_data_render(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Dat EEVEE_EffectsInfo *effects = stl->effects; if ((effects->enabled_effects & EFFECT_SSS) != 0) { - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Clear sss_data texture only... can this be done in a more clever way? */ GPU_framebuffer_bind(fbl->sss_clear_fb); GPU_framebuffer_clear_color(fbl->sss_clear_fb, clear); @@ -320,7 +320,7 @@ void EEVEE_subsurface_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) EEVEE_EffectsInfo *effects = stl->effects; if ((effects->enabled_effects & EFFECT_SSS) != 0) { - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; DRW_stats_group_start("SSS"); diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c index e184a80d2f6..12b50030435 100644 --- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c @@ -171,7 +171,7 @@ void EEVEE_temporal_sampling_update_matrices(EEVEE_Data *vedata) double ht_point[2]; double ht_offset[2] = {0.0, 0.0}; - uint ht_primes[2] = {2, 3}; + const uint ht_primes[2] = {2, 3}; BLI_halton_2d(ht_primes, ht_offset, effects->taa_current_sample - 1, ht_point); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 57d5e54290e..e1e65c29b4f 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -149,7 +149,7 @@ void EEVEE_volumes_set_jitter(EEVEE_ViewLayerData *sldata, uint current_sample) double ht_point[3]; double ht_offset[3] = {0.0, 0.0}; - uint ht_primes[3] = {3, 7, 2}; + const uint ht_primes[3] = {3, 7, 2}; BLI_halton_3d(ht_primes, ht_offset, current_sample, ht_point); @@ -279,8 +279,8 @@ void EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) common_data->vol_use_lights = (scene_eval->eevee.flag & SCE_EEVEE_VOLUMETRIC_LIGHTS) != 0; if (!e_data.dummy_scatter) { - float scatter[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - float transmit[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + const float scatter[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float transmit[4] = {1.0f, 1.0f, 1.0f, 1.0f}; e_data.dummy_scatter = DRW_texture_create_3d(1, 1, 1, GPU_RGBA8, DRW_TEX_WRAP, scatter); e_data.dummy_transmit = DRW_texture_create_3d(1, 1, 1, GPU_RGBA8, DRW_TEX_WRAP, transmit); } @@ -852,7 +852,7 @@ void EEVEE_volumes_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, EEVEE_PassList *psl = vedata->psl; EEVEE_EffectsInfo *effects = stl->effects; - float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear[4] = {0.0f, 0.0f, 0.0f, 0.0f}; /* Create FrameBuffer. */ diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c index 3ef20dbe9ec..36d295d1dde 100644 --- a/source/blender/draw/engines/external/external_engine.c +++ b/source/blender/draw/engines/external/external_engine.c @@ -268,7 +268,7 @@ static void external_draw_scene(void *vedata) * OpenGL render is used for quick preview (thumbnails or sequencer preview) * where using the rendering engine to preview doesn't make so much sense. */ if (draw_ctx->evil_C) { - float clear_col[4] = {0, 0, 0, 0}; + const float clear_col[4] = {0, 0, 0, 0}; /* This is to keep compatibility with external engine. */ /* TODO(fclem) remove it eventually. */ GPU_framebuffer_bind(dfbl->default_fb); diff --git a/source/blender/draw/engines/gpencil/gpencil_antialiasing.c b/source/blender/draw/engines/gpencil/gpencil_antialiasing.c index 8955240c549..b9600ad8caf 100644 --- a/source/blender/draw/engines/gpencil/gpencil_antialiasing.c +++ b/source/blender/draw/engines/gpencil/gpencil_antialiasing.c @@ -36,7 +36,7 @@ void GPENCIL_antialiasing_init(struct GPENCIL_Data *vedata) const float *size = DRW_viewport_size_get(); const float *sizeinv = DRW_viewport_invert_size_get(); - float metrics[4] = {sizeinv[0], sizeinv[1], size[0], size[1]}; + const float metrics[4] = {sizeinv[0], sizeinv[1], size[0], size[1]}; if (pd->simplify_antialias) { /* No AA fallback. */ diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index 41a7196cb90..363794e1be3 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -245,7 +245,7 @@ static void gpencil_layer_random_color_get(const Object *ob, uint ob_hash = BLI_ghashutil_strhash_p_murmur(ob->id.name); uint gpl_hash = BLI_ghashutil_strhash_p_murmur(gpl->info); float hue = BLI_hash_int_01(ob_hash * gpl_hash); - float hsv[3] = {hue, hsv_saturation, hsv_value}; + const float hsv[3] = {hue, hsv_saturation, hsv_value}; hsv_to_rgb_v(hsv, r_color); } diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index dbad226099e..746920e38c6 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -71,7 +71,7 @@ void GPENCIL_engine_init(void *ved) } if (txl->dummy_texture == NULL) { - float pixels[1][4] = {{1.0f, 0.0f, 1.0f, 1.0f}}; + const float pixels[1][4] = {{1.0f, 0.0f, 1.0f, 1.0f}}; txl->dummy_texture = DRW_texture_create_2d(1, 1, GPU_RGBA8, DRW_TEX_WRAP, (float *)pixels); } @@ -766,7 +766,7 @@ static void gpencil_draw_mask(GPENCIL_Data *vedata, GPENCIL_tObject *ob, GPENCIL { GPENCIL_PassList *psl = vedata->psl; GPENCIL_FramebufferList *fbl = vedata->fbl; - float clear_col[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + const float clear_col[4] = {1.0f, 1.0f, 1.0f, 1.0f}; float clear_depth = ob->is_drawmode3d ? 1.0f : 0.0f; bool inverted = false; /* OPTI(fclem) we could optimize by only clearing if the new mask_bits does not contain all @@ -813,7 +813,7 @@ static void GPENCIL_draw_object(GPENCIL_Data *vedata, GPENCIL_tObject *ob) GPENCIL_PassList *psl = vedata->psl; GPENCIL_PrivateData *pd = vedata->stl->pd; GPENCIL_FramebufferList *fbl = vedata->fbl; - float clear_cols[2][4] = {{0.0f, 0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}; + const float clear_cols[2][4] = {{0.0f, 0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}; DRW_stats_group_start("GPencil Object"); diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c index c3294f88acf..df52b65aa78 100644 --- a/source/blender/draw/engines/gpencil/gpencil_render.c +++ b/source/blender/draw/engines/gpencil/gpencil_render.c @@ -129,7 +129,7 @@ void GPENCIL_render_init(GPENCIL_Data *vedata, /* To avoid unpredictable result, clear buffers that have not be initialized. */ GPU_framebuffer_bind(fbl->render_fb); if (do_clear_col) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; GPU_framebuffer_clear_color(fbl->render_fb, clear_col); } if (do_clear_z) { diff --git a/source/blender/draw/engines/overlay/overlay_antialiasing.c b/source/blender/draw/engines/overlay/overlay_antialiasing.c index a32242d6292..9e95e860d0a 100644 --- a/source/blender/draw/engines/overlay/overlay_antialiasing.c +++ b/source/blender/draw/engines/overlay/overlay_antialiasing.c @@ -69,7 +69,7 @@ void OVERLAY_antialiasing_init(OVERLAY_Data *vedata) /* Small texture which will have very small impact on rendertime. */ if (txl->dummy_depth_tx == NULL) { - float pixel[1] = {1.0f}; + const float pixel[1] = {1.0f}; txl->dummy_depth_tx = DRW_texture_create_2d(1, 1, GPU_DEPTH_COMPONENT24, 0, pixel); } @@ -202,7 +202,7 @@ void OVERLAY_antialiasing_start(OVERLAY_Data *vedata) OVERLAY_PrivateData *pd = vedata->stl->pd; if (pd->antialiasing.enabled) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; GPU_framebuffer_bind(fbl->overlay_line_fb); GPU_framebuffer_clear_color(fbl->overlay_line_fb, clear_col); } diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index 1a3bfb9934c..6638f8e9e2e 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -601,7 +601,7 @@ static void drw_shgroup_bone_custom_empty(ArmatureDrawContext *ctx, const float color[4], Object *custom) { - float final_color[4] = {color[0], color[1], color[2], 1.0f}; + const float final_color[4] = {color[0], color[1], color[2], 1.0f}; float mat[4][4]; mul_m4_m4m4(mat, ctx->ob->obmat, bone_mat); diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c index bc96a03da31..1312408498a 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.c +++ b/source/blender/draw/engines/overlay/overlay_engine.c @@ -440,7 +440,7 @@ static void OVERLAY_draw_scene(void *vedata) DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get(); if (DRW_state_is_fbo()) { - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; GPU_framebuffer_bind(dfbl->overlay_only_fb); GPU_framebuffer_clear_color(dfbl->overlay_only_fb, clear_col); } diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index c7c4e2b1a3a..ce678c7d03f 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -277,7 +277,7 @@ void OVERLAY_extra_wire(OVERLAY_ExtraCallBuffers *cb, const float color[4]) { float draw_mat[4][4]; - float col[4] = {UNPACK3(color), 0.0f /* No stipples. */}; + const float col[4] = {UNPACK3(color), 0.0f /* No stipples. */}; pack_v4_in_mat4(draw_mat, mat, col); DRW_shgroup_call_obmat(cb->extra_wire, geom, draw_mat); } @@ -679,8 +679,8 @@ void OVERLAY_light_cache_populate(OVERLAY_Data *vedata, Object *ob) DRW_buffer_add_entry(cb->light_spot, color, &instdata); if ((la->mode & LA_SHOW_CONE) && !DRW_state_is_select()) { - float color_inside[4] = {0.0f, 0.0f, 0.0f, 0.5f}; - float color_outside[4] = {1.0f, 1.0f, 1.0f, 0.3f}; + const float color_inside[4] = {0.0f, 0.0f, 0.0f, 0.5f}; + const float color_outside[4] = {1.0f, 1.0f, 1.0f, 0.3f}; DRW_buffer_add_entry(cb->light_spot_cone_front, color_inside, &instdata); DRW_buffer_add_entry(cb->light_spot_cone_back, color_outside, &instdata); } @@ -1539,7 +1539,7 @@ void OVERLAY_extra_cache_populate(OVERLAY_Data *vedata, Object *ob) } /* Helpers for when we're transforming origins. */ if (draw_xform) { - float color_xform[4] = {0.15f, 0.15f, 0.15f, 0.7f}; + const float color_xform[4] = {0.15f, 0.15f, 0.15f, 0.7f}; DRW_buffer_add_entry(cb->origin_xform, color_xform, ob->obmat); } /* don't show object extras in set's */ diff --git a/source/blender/draw/engines/overlay/overlay_image.c b/source/blender/draw/engines/overlay/overlay_image.c index 06d92f486d0..08cddf4e185 100644 --- a/source/blender/draw/engines/overlay/overlay_image.c +++ b/source/blender/draw/engines/overlay/overlay_image.c @@ -340,7 +340,7 @@ void OVERLAY_image_camera_cache_populate(OVERLAY_Data *vedata, Object *ob) mul_m4_m4m4(mat, modelmat, mat); const bool is_foreground = (bgpic->flag & CAM_BGIMG_FLAG_FOREGROUND) != 0; - float color_premult_alpha[4] = {1.0f, 1.0f, 1.0f, bgpic->alpha}; + const float color_premult_alpha[4] = {1.0f, 1.0f, 1.0f, bgpic->alpha}; DRWPass *pass = is_foreground ? psl->image_foreground_ps : psl->image_background_ps; diff --git a/source/blender/draw/engines/overlay/overlay_motion_path.c b/source/blender/draw/engines/overlay/overlay_motion_path.c index 168f6f8a17f..0e5a52702fe 100644 --- a/source/blender/draw/engines/overlay/overlay_motion_path.c +++ b/source/blender/draw/engines/overlay/overlay_motion_path.c @@ -149,7 +149,7 @@ static void motion_path_cache(OVERLAY_Data *vedata, /* Draw curve-line of path. */ if (show_lines) { - int motion_path_settings[4] = {cfra, sfra, efra, mpath->start_frame}; + const int motion_path_settings[4] = {cfra, sfra, efra, mpath->start_frame}; DRWShadingGroup *grp = DRW_shgroup_create_sub(pd->motion_path_lines_grp); DRW_shgroup_uniform_ivec4_copy(grp, "mpathLineSettings", motion_path_settings); DRW_shgroup_uniform_int_copy(grp, "lineThickness", mpath->line_thickness); @@ -162,7 +162,7 @@ static void motion_path_cache(OVERLAY_Data *vedata, /* Draw points. */ { int pt_size = max_ii(mpath->line_thickness - 1, 1); - int motion_path_settings[4] = {pt_size, cfra, mpath->start_frame, stepsize}; + const int motion_path_settings[4] = {pt_size, cfra, mpath->start_frame, stepsize}; DRWShadingGroup *grp = DRW_shgroup_create_sub(pd->motion_path_points_grp); DRW_shgroup_uniform_ivec4_copy(grp, "mpathPointSettings", motion_path_settings); DRW_shgroup_uniform_bool_copy(grp, "showKeyFrames", show_keyframes); diff --git a/source/blender/draw/engines/overlay/overlay_outline.c b/source/blender/draw/engines/overlay/overlay_outline.c index 214322c4adc..e904066248f 100644 --- a/source/blender/draw/engines/overlay/overlay_outline.c +++ b/source/blender/draw/engines/overlay/overlay_outline.c @@ -342,7 +342,7 @@ void OVERLAY_outline_draw(OVERLAY_Data *vedata) { OVERLAY_FramebufferList *fbl = vedata->fbl; OVERLAY_PassList *psl = vedata->psl; - float clearcol[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clearcol[4] = {0.0f, 0.0f, 0.0f, 0.0f}; bool do_outlines = psl->outlines_prepass_ps != NULL && !DRW_pass_is_empty(psl->outlines_prepass_ps); diff --git a/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c b/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c index faf64b55c2d..47a03073839 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c +++ b/source/blender/draw/engines/workbench/workbench_effect_antialiasing.c @@ -301,7 +301,7 @@ void workbench_antialiasing_cache_init(WORKBENCH_Data *vedata) const float *size = DRW_viewport_size_get(); const float *sizeinv = DRW_viewport_invert_size_get(); - float metrics[4] = {sizeinv[0], sizeinv[1], size[0], size[1]}; + const float metrics[4] = {sizeinv[0], sizeinv[1], size[0], size[1]}; { /* Stage 1: Edge detection. */ diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c index e13f7bfdd92..f2f75d616ff 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_dof.c +++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c @@ -155,7 +155,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata) } const float *full_size = DRW_viewport_size_get(); - int size[2] = {max_ii(1, (int)full_size[0] / 2), max_ii(1, (int)full_size[1] / 2)}; + const int size[2] = {max_ii(1, (int)full_size[0] / 2), max_ii(1, (int)full_size[1] / 2)}; #if 0 /* TODO(fclem) finish COC min_max optimisation */ /* NOTE: We Ceil here in order to not miss any edge texel if using a NPO2 texture. */ int shrink_h_size[2] = {ceilf(size[0] / 8.0f), size[1]}; diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 53119723fab..ca80b6a9002 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -64,7 +64,7 @@ void workbench_engine_init(void *ved) workbench_update_world_ubo(wpd); if (txl->dummy_image_tx == NULL) { - float fpixel[4] = {1.0f, 0.0f, 1.0f, 1.0f}; + const float fpixel[4] = {1.0f, 0.0f, 1.0f, 1.0f}; txl->dummy_image_tx = DRW_texture_create_2d(1, 1, GPU_RGBA8, 0, fpixel); } wpd->dummy_image_tx = txl->dummy_image_tx; @@ -480,8 +480,8 @@ void workbench_draw_sample(void *ved) WORKBENCH_PrivateData *wpd = vedata->stl->wpd; WORKBENCH_PassList *psl = vedata->psl; DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get(); - float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - float clear_col_with_alpha[4] = {0.0f, 0.0f, 0.0f, 1.0f}; + const float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float clear_col_with_alpha[4] = {0.0f, 0.0f, 0.0f, 1.0f}; const bool do_render = workbench_antialiasing_setup(vedata); const bool xray_is_visible = wpd->shading.xray_alpha > 0.0f; diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 2ed63bac853..538083b4beb 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -60,7 +60,7 @@ void workbench_material_ubo_data(WORKBENCH_PrivateData *wpd, hash = (hash * 13) ^ BLI_ghashutil_strhash_p_murmur(ob->id.lib->filepath); } float hue = BLI_hash_int_01(hash); - float hsv[3] = {hue, HSV_SATURATION, HSV_VALUE}; + const float hsv[3] = {hue, HSV_SATURATION, HSV_VALUE}; hsv_to_rgb_v(hsv, data->base_color); break; } diff --git a/source/blender/draw/engines/workbench/workbench_shadow.c b/source/blender/draw/engines/workbench/workbench_shadow.c index 2cf5f3c4c13..56a028d5a7e 100644 --- a/source/blender/draw/engines/workbench/workbench_shadow.c +++ b/source/blender/draw/engines/workbench/workbench_shadow.c @@ -62,7 +62,7 @@ static void workbench_shadow_update(WORKBENCH_PrivateData *wpd) wpd->shadow_cached_direction, wpd->shadow_direction_ws, 1e-5f); if (wpd->shadow_changed) { - float up[3] = {0.0f, 0.0f, 1.0f}; + const float up[3] = {0.0f, 0.0f, 1.0f}; unit_m4(wpd->shadow_mat); /* TODO fix singularity. */ @@ -229,7 +229,7 @@ static float workbench_shadow_object_shadow_distance(WORKBENCH_PrivateData *wpd, { BoundBox *shadow_bbox = workbench_shadow_object_shadow_bbox_get(wpd, ob, oed); - int corners[4] = {0, 3, 4, 7}; + const int corners[4] = {0, 3, 4, 7}; float dist = 1e4f, dist_isect; for (int i = 0; i < 4; i++) { if (isect_ray_plane_v3(shadow_bbox->vec[corners[i]], diff --git a/source/blender/draw/engines/workbench/workbench_volume.c b/source/blender/draw/engines/workbench/workbench_volume.c index d3c4d51dbd4..f71e77d5da5 100644 --- a/source/blender/draw/engines/workbench/workbench_volume.c +++ b/source/blender/draw/engines/workbench/workbench_volume.c @@ -43,8 +43,8 @@ void workbench_volume_engine_init(WORKBENCH_Data *vedata) WORKBENCH_TextureList *txl = vedata->txl; if (txl->dummy_volume_tx == NULL) { - float zero[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - float one[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + const float zero[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + const float one[4] = {1.0f, 1.0f, 1.0f, 1.0f}; txl->dummy_volume_tx = GPU_texture_create_3d(1, 1, 1, GPU_RGBA8, zero, NULL); txl->dummy_shadow_tx = GPU_texture_create_3d(1, 1, 1, GPU_RGBA8, one, NULL); txl->dummy_coba_tx = GPU_texture_create_1d(1, GPU_RGBA8, zero, NULL); -- cgit v1.2.3