From 42717596d0c8638bd672966c0f1198db8344dcd5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 20 Apr 2022 09:13:48 +1000 Subject: Cleanup: clang-format --- intern/cycles/scene/object.cpp | 2 +- intern/ghost/intern/GHOST_Wintab.cpp | 32 ++++++++++++++-------- source/blender/blenkernel/BKE_global.h | 4 +-- .../eevee/shaders/volumetric_integration_frag.glsl | 6 ++-- source/blender/draw/intern/draw_manager_data.c | 2 +- .../material/gpu_shader_material_hair_info.glsl | 1 - .../material/gpu_shader_material_point_info.glsl | 1 - .../gpu_shader_material_tex_environment.glsl | 1 - 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/intern/cycles/scene/object.cpp b/intern/cycles/scene/object.cpp index c57d26464ed..676cc78a11f 100644 --- a/intern/cycles/scene/object.cpp +++ b/intern/cycles/scene/object.cpp @@ -496,7 +496,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s kobject.dupli_generated[2] = ob->dupli_generated[2]; kobject.numkeys = (geom->geometry_type == Geometry::HAIR) ? static_cast(geom)->get_curve_keys().size() : - (geom->geometry_type == Geometry::POINTCLOUD) ? + (geom->geometry_type == Geometry::POINTCLOUD) ? static_cast(geom)->num_points() : 0; kobject.dupli_uv[0] = ob->dupli_uv[0]; diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp index be1a0a4b314..8e246272958 100644 --- a/intern/ghost/intern/GHOST_Wintab.cpp +++ b/intern/ghost/intern/GHOST_Wintab.cpp @@ -116,7 +116,11 @@ GHOST_Wintab *GHOST_Wintab::loadWintab(HWND hwnd) } int sanityQueueSize = queueSizeGet(hctx.get()); - WINTAB_PRINTF("HCTX %p %s queueSize: %d, queueSizeGet: %d\n", hctx.get(), __func__, queueSize, sanityQueueSize); + WINTAB_PRINTF("HCTX %p %s queueSize: %d, queueSizeGet: %d\n", + hctx.get(), + __func__, + queueSize, + sanityQueueSize); WINTAB_PRINTF("Loaded Wintab context %p\n", hctx.get()); @@ -274,7 +278,11 @@ void GHOST_Wintab::updateCursorInfo() else { m_maxAzimuth = m_maxAltitude = 0; } - WINTAB_PRINTF("HCTX %p %s maxAzimuth: %d, maxAltitude: %d\n", m_context.get(), __func__, m_maxAzimuth, m_maxAltitude); + WINTAB_PRINTF("HCTX %p %s maxAzimuth: %d, maxAltitude: %d\n", + m_context.get(), + __func__, + m_maxAzimuth, + m_maxAltitude); } void GHOST_Wintab::processInfoChange(LPARAM lParam) @@ -531,10 +539,10 @@ void GHOST_Wintab::printContextDebugInfo() /* Print system information. */ printf("left: %d, top: %d, width: %d, height: %d\n", - ::GetSystemMetrics(SM_XVIRTUALSCREEN), - ::GetSystemMetrics(SM_YVIRTUALSCREEN), - ::GetSystemMetrics(SM_CXVIRTUALSCREEN), - ::GetSystemMetrics(SM_CYVIRTUALSCREEN)); + ::GetSystemMetrics(SM_XVIRTUALSCREEN), + ::GetSystemMetrics(SM_YVIRTUALSCREEN), + ::GetSystemMetrics(SM_CXVIRTUALSCREEN), + ::GetSystemMetrics(SM_CYVIRTUALSCREEN)); auto printContextRanges = [](LOGCONTEXT &lc) { printf("lcInOrgX: %d, lcInOrgY: %d, lcInExtX: %d, lcInExtY: %d\n", @@ -576,7 +584,7 @@ void GHOST_Wintab::printContextDebugInfo() m_fpInfo(WTI_DEFSYSCTX, CTX_SYSEXTY, &lc.lcSysExtY); printf("WTI_DEFSYSCTX CTX_*\n"); printContextRanges(lc); - + for (unsigned int i = 0; i < m_numDevices; i++) { /* Print individual device system context. */ m_fpInfo(WTI_DSCTXS + i, 0, &lc); @@ -604,11 +612,11 @@ void GHOST_Wintab::printContextDebugInfo() m_fpInfo(WTI_DEVICES + i, DVC_X, &axis_x); m_fpInfo(WTI_DEVICES + i, DVC_Y, &axis_y); printf("WTI_DEVICES %u axis_x org: %d, axis_y org: %d axis_x ext: %d, axis_y ext: %d\n", - i, - axis_x.axMin, - axis_y.axMin, - axis_x.axMax - axis_x.axMin + 1, - axis_y.axMax - axis_y.axMin + 1); + i, + axis_x.axMin, + axis_y.axMin, + axis_x.axMax - axis_x.axMin + 1, + axis_y.axMax - axis_y.axMin + 1); } /* Other stuff while we have a logcontext. */ diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 2070584a8a0..06feb07aef2 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -195,8 +195,8 @@ enum { G_DEBUG_XR = (1 << 19), /* XR/OpenXR messages */ G_DEBUG_XR_TIME = (1 << 20), /* XR/OpenXR timing messages */ - G_DEBUG_GHOST = (1 << 21), /* Debug GHOST module. */ - G_DEBUG_WINTAB = (1 << 22), /* Debug Wintab. */ + G_DEBUG_GHOST = (1 << 21), /* Debug GHOST module. */ + G_DEBUG_WINTAB = (1 << 22), /* Debug Wintab. */ }; #define G_DEBUG_ALL \ diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl index 26b60c992e1..527bbd18896 100644 --- a/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl @@ -11,10 +11,8 @@ uniform sampler3D volumeScattering; /* Result of the scatter step */ uniform sampler3D volumeExtinction; #ifdef USE_VOLUME_OPTI -uniform layout(r11f_g11f_b10f) -writeonly restrict image3D finalScattering_img; -uniform layout(r11f_g11f_b10f) -writeonly restrict image3D finalTransmittance_img; +uniform layout(r11f_g11f_b10f) writeonly restrict image3D finalScattering_img; +uniform layout(r11f_g11f_b10f) writeonly restrict image3D finalTransmittance_img; vec3 finalScattering; vec3 finalTransmittance; diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 7c779b42c73..b5432da0957 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -624,7 +624,7 @@ static void drw_call_obinfos_init(DRWObjectInfos *ob_infos, Object *ob) drw_call_calc_orco(ob, ob_infos->orcotexfac); /* Random float value. */ uint random = (DST.dupli_source) ? - DST.dupli_source->random_id : + DST.dupli_source->random_id : /* TODO(fclem): this is rather costly to do at runtime. Maybe we can * put it in ob->runtime and make depsgraph ensure it is up to date. */ BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0); diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_hair_info.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_hair_info.glsl index 2885bf4e082..a8b4b039370 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_hair_info.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_hair_info.glsl @@ -1,6 +1,5 @@ #pragma BLENDER_REQUIRE(gpu_shader_material_hash.glsl) - void node_hair_info(float hair_length, out float is_strand, out float intercept, diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_point_info.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_point_info.glsl index 1b1fed9502e..ad3d4737193 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_point_info.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_point_info.glsl @@ -1,6 +1,5 @@ #pragma BLENDER_REQUIRE(gpu_shader_material_hash.glsl) - void node_point_info(out vec3 position, out float radius, out float random) { #ifdef POINTCLOUD_SHADER diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_tex_environment.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_tex_environment.glsl index 89091316823..da131978f72 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_tex_environment.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_tex_environment.glsl @@ -1,6 +1,5 @@ #pragma BLENDER_REQUIRE(gpu_shader_material_math_util.glsl) - void node_tex_environment_equirectangular(vec3 co, out vec3 uv) { vec3 nco = normalize(co); -- cgit v1.2.3