From 41d4a1986548e66a652221e4a68c52900474eeff Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 08:24:14 +0200 Subject: ClangFormat: format '#if 0' code in source/ --- source/blender/draw/engines/eevee/eevee_effects.c | 3 +- .../blender/draw/engines/eevee/eevee_materials.c | 69 ++++++++++++---------- .../blender/draw/engines/eevee/eevee_motion_blur.c | 6 +- .../draw/engines/workbench/workbench_effect_dof.c | 42 +++++++------ .../draw/engines/workbench/workbench_studiolight.c | 12 ++-- 5 files changed, 73 insertions(+), 59 deletions(-) (limited to 'source/blender/draw/engines') diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index e77d7b16c78..79b4cb231a8 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -413,7 +413,8 @@ void EEVEE_create_minmax_buffer(EEVEE_Data *vedata, GPUTexture *depth_src, int l GPU_framebuffer_texture_detach(stl->g_data->minzbuffer); /* Create lower levels */ - GPU_framebuffer_recursive_downsample(fbl->downsample_fb, stl->g_data->minzbuffer, 8, &min_downsample_cb, vedata); + GPU_framebuffer_recursive_downsample( + fbl->downsample_fb, stl->g_data->minzbuffer, 8, &min_downsample_cb, vedata); DRW_stats_group_end(); #endif int minmax_size[3], depth_size[3]; diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 9268f2e8a46..0557fd11995 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -115,15 +115,15 @@ static struct GPUTexture *create_ggx_lut_texture(int UNUSED(w), int UNUSED(h)) static float samples_len = 8192.0f; static float inv_samples_len = 1.0f / 8192.0f; - char *lib_str = BLI_string_joinN( - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl); + char *lib_str = BLI_string_joinN(datatoc_bsdf_common_lib_glsl, datatoc_bsdf_sampling_lib_glsl); - struct GPUShader *sh = DRW_shader_create_with_lib( - datatoc_lightprobe_vert_glsl, datatoc_lightprobe_geom_glsl, datatoc_bsdf_lut_frag_glsl, lib_str, - "#define HAMMERSLEY_SIZE 8192\n" - "#define BRDF_LUT_SIZE 64\n" - "#define NOISE_SIZE 64\n"); + struct GPUShader *sh = DRW_shader_create_with_lib(datatoc_lightprobe_vert_glsl, + datatoc_lightprobe_geom_glsl, + datatoc_bsdf_lut_frag_glsl, + lib_str, + "#define HAMMERSLEY_SIZE 8192\n" + "#define BRDF_LUT_SIZE 64\n" + "#define NOISE_SIZE 64\n"); DRWPass *pass = DRW_pass_create("LightProbe Filtering", DRW_STATE_WRITE_COLOR); DRWShadingGroup *grp = DRW_shgroup_create(sh, pass); @@ -150,11 +150,14 @@ static struct GPUTexture *create_ggx_lut_texture(int UNUSED(w), int UNUSED(h)) glReadPixels(0, 0, w, h, GL_RGB, GL_FLOAT, data); printf("{"); - for (int i = 0; i < w*h * 3; i+=3) { - printf("%ff, %ff, ", data[i], data[i+1]); i+=3; - printf("%ff, %ff, ", data[i], data[i+1]); i+=3; - printf("%ff, %ff, ", data[i], data[i+1]); i+=3; - printf("%ff, %ff, \n", data[i], data[i+1]); + for (int i = 0; i < w * h * 3; i += 3) { + printf("%ff, %ff, ", data[i], data[i + 1]); + i += 3; + printf("%ff, %ff, ", data[i], data[i + 1]); + i += 3; + printf("%ff, %ff, ", data[i], data[i + 1]); + i += 3; + printf("%ff, %ff, \n", data[i], data[i + 1]); } printf("}"); @@ -174,15 +177,13 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h) static float inv_samples_len = 1.0f / 8192.0f; char *frag_str = BLI_string_joinN( - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl, - datatoc_btdf_lut_frag_glsl); + datatoc_bsdf_common_lib_glsl, datatoc_bsdf_sampling_lib_glsl, datatoc_btdf_lut_frag_glsl); struct GPUShader *sh = DRW_shader_create_fullscreen(frag_str, - "#define HAMMERSLEY_SIZE 8192\n" - "#define BRDF_LUT_SIZE 64\n" - "#define NOISE_SIZE 64\n" - "#define LUT_SIZE 64\n"); + "#define HAMMERSLEY_SIZE 8192\n" + "#define BRDF_LUT_SIZE 64\n" + "#define NOISE_SIZE 64\n" + "#define LUT_SIZE 64\n"); MEM_freeN(frag_str); @@ -222,20 +223,28 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h) # if 1 fprintf(f, "\t{\n\t\t"); - for (int i = 0; i < w*h * 3; i+=3) { + for (int i = 0; i < w * h * 3; i += 3) { fprintf(f, "%ff,", data[i]); - if (((i/3)+1) % 12 == 0) fprintf(f, "\n\t\t"); - else fprintf(f, " "); + if (((i / 3) + 1) % 12 == 0) + fprintf(f, "\n\t\t"); + else + fprintf(f, " "); } fprintf(f, "\n\t},\n"); # else - for (int i = 0; i < w*h * 3; i+=3) { - if (data[i] < 0.01) printf(" "); - else if (data[i] < 0.3) printf("."); - else if (data[i] < 0.6) printf("+"); - else if (data[i] < 0.9) printf("%%"); - else printf("#"); - if ((i/3+1) % 64 == 0) printf("\n"); + for (int i = 0; i < w * h * 3; i += 3) { + if (data[i] < 0.01) + printf(" "); + else if (data[i] < 0.3) + printf("."); + else if (data[i] < 0.6) + printf("+"); + else if (data[i] < 0.9) + printf("%%"); + else + printf("#"); + if ((i / 3 + 1) % 64 == 0) + printf("\n"); } # endif diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index f2863d572c4..f8795a7ff0e 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -165,11 +165,7 @@ int EEVEE_motion_blur_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *veda #if 0 /* for future high quality blur */ /* Future matrix */ eevee_motion_blur_camera_get_matrix_at_time( - scene, - ar, rv3d, v3d, - ob_camera_eval, - ctime + delta, - effects->future_world_to_ndc); + scene, ar, rv3d, v3d, ob_camera_eval, ctime + delta, effects->future_world_to_ndc); #endif invert_m4_m4(effects->current_ndc_to_world, effects->current_world_to_ndc); } diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c index 3e35f8120d7..f55b744481e 100644 --- a/source/blender/draw/engines/workbench/workbench_effect_dof.c +++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c @@ -185,9 +185,12 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata, Object *camera) wpd->dof_blur_tx = DRW_texture_pool_query_2d( size[0], size[1], GPU_R11F_G11F_B10F, &draw_engine_workbench_solid); #if 0 - wpd->coc_temp_tx = DRW_texture_pool_query_2d(shrink_h_size[0], shrink_h_size[1], GPU_RG8, &draw_engine_workbench_solid); - wpd->coc_tiles_tx[0] = DRW_texture_pool_query_2d(shrink_w_size[0], shrink_w_size[1], GPU_RG8, &draw_engine_workbench_solid); - wpd->coc_tiles_tx[1] = DRW_texture_pool_query_2d(shrink_w_size[0], shrink_w_size[1], GPU_RG8, &draw_engine_workbench_solid); + wpd->coc_temp_tx = DRW_texture_pool_query_2d( + shrink_h_size[0], shrink_h_size[1], GPU_RG8, &draw_engine_workbench_solid); + wpd->coc_tiles_tx[0] = DRW_texture_pool_query_2d( + shrink_w_size[0], shrink_w_size[1], GPU_RG8, &draw_engine_workbench_solid); + wpd->coc_tiles_tx[1] = DRW_texture_pool_query_2d( + shrink_w_size[0], shrink_w_size[1], GPU_RG8, &draw_engine_workbench_solid); #endif GPU_framebuffer_ensure_config(&fbl->dof_downsample_fb, @@ -197,18 +200,21 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata, Object *camera) GPU_ATTACHMENT_TEXTURE(txl->coc_halfres_tx), }); #if 0 - GPU_framebuffer_ensure_config(&fbl->dof_coc_tile_h_fb, { - GPU_ATTACHMENT_NONE, - GPU_ATTACHMENT_TEXTURE(wpd->coc_temp_tx), - }); - GPU_framebuffer_ensure_config(&fbl->dof_coc_tile_v_fb, { - GPU_ATTACHMENT_NONE, - GPU_ATTACHMENT_TEXTURE(wpd->coc_tiles_tx[0]), - }); - GPU_framebuffer_ensure_config(&fbl->dof_coc_dilate_fb, { - GPU_ATTACHMENT_NONE, - GPU_ATTACHMENT_TEXTURE(wpd->coc_tiles_tx[1]), - }); + GPU_framebuffer_ensure_config(&fbl->dof_coc_tile_h_fb, + { + GPU_ATTACHMENT_NONE, + GPU_ATTACHMENT_TEXTURE(wpd->coc_temp_tx), + }); + GPU_framebuffer_ensure_config(&fbl->dof_coc_tile_v_fb, + { + GPU_ATTACHMENT_NONE, + GPU_ATTACHMENT_TEXTURE(wpd->coc_tiles_tx[0]), + }); + GPU_framebuffer_ensure_config(&fbl->dof_coc_dilate_fb, + { + GPU_ATTACHMENT_NONE, + GPU_ATTACHMENT_TEXTURE(wpd->coc_tiles_tx[1]), + }); #endif GPU_framebuffer_ensure_config(&fbl->dof_blur1_fb, { @@ -318,12 +324,14 @@ void workbench_dof_create_pass(WORKBENCH_Data *vedata, } #if 0 { - DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_flatten_h_sh, psl->dof_flatten_h_ps); + DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_flatten_h_sh, + psl->dof_flatten_h_ps); DRW_shgroup_uniform_texture(grp, "inputCocTex", txl->coc_halfres_tx); DRW_shgroup_call_add(grp, quad, NULL); } { - DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_flatten_v_sh, psl->dof_flatten_v_ps); + DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_dof_flatten_v_sh, + psl->dof_flatten_v_ps); DRW_shgroup_uniform_texture(grp, "inputCocTex", wpd->coc_temp_tx); DRW_shgroup_call_add(grp, quad, NULL); } diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c index 5c95a835adc..3fc83fea7c6 100644 --- a/source/blender/draw/engines/workbench/workbench_studiolight.c +++ b/source/blender/draw/engines/workbench/workbench_studiolight.c @@ -78,12 +78,12 @@ void studiolight_update_world(WORKBENCH_PrivateData *wpd, mul_v3_v3fl(wd->spherical_harmonics_coefs[0], sl->spherical_harmonics_coefs[0], M_1_PI); /* Swizzle to make shader code simpler. */ for (int i = 0; i < 3; ++i) { - copy_v3_fl3( - wd->spherical_harmonics_coefs[i + 1], - -sl->spherical_harmonics_coefs[3][i], - sl->spherical_harmonics_coefs[2][i], - -sl->spherical_harmonics_coefs[1][i]); - mul_v3_fl(wd->spherical_harmonics_coefs[i + 1], M_1_PI * 1.5f); /* 1.5f is to improve the contrast a bit. */ + copy_v3_fl3(wd->spherical_harmonics_coefs[i + 1], + -sl->spherical_harmonics_coefs[3][i], + sl->spherical_harmonics_coefs[2][i], + -sl->spherical_harmonics_coefs[1][i]); + mul_v3_fl(wd->spherical_harmonics_coefs[i + 1], + M_1_PI * 1.5f); /* 1.5f is to improve the contrast a bit. */ } /* Precompute as much as we can. See shader code for derivation. */ -- cgit v1.2.3