From 077832e06320b34446e921c2db59533d454d67d2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 26 Sep 2023 19:50:04 +1000 Subject: [PATCH] Cleanup: spelling in comments --- intern/cycles/device/metal/bvh.mm | 14 +++++++------- intern/cycles/device/metal/device_impl.mm | 4 ++-- source/blender/blenkernel/BKE_screen.hh | 4 ++-- source/blender/blenlib/BLI_string_search.hh | 2 +- .../engines/eevee/shaders/common_utiltex_lib.glsl | 4 ++-- .../eevee_next/shaders/eevee_nodetree_lib.glsl | 4 ++-- .../gpu/shaders/metal/mtl_shader_defines.msl | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/intern/cycles/device/metal/bvh.mm b/intern/cycles/device/metal/bvh.mm index c090b0d9768..a4de673a0f5 100644 --- a/intern/cycles/device/metal/bvh.mm +++ b/intern/cycles/device/metal/bvh.mm @@ -49,7 +49,7 @@ struct BVHMetalBuildThrottler { bvh_throttle_printf("safe_wired_limit = %zu\n", safe_wired_limit); } - /* Block until we're safely able to wire the requsted resources. */ + /* Block until we're safely able to wire the requested resources. */ void acquire(size_t bytes_to_be_wired) { bool throttled = false; @@ -291,8 +291,8 @@ bool BVHMetal::build_BLAS_mesh(Progress &progress, } [accelEnc endEncoding]; - /* Estimated size of resources that will be wired for the GPU accelerated build. Accel-struct - * size is doubled to account for possible compaction step. */ + /* Estimated size of resources that will be wired for the GPU accelerated build. + * Acceleration-struct size is doubled to account for possible compaction step. */ size_t wired_size = posBuf.allocatedSize + indexBuf.allocatedSize + scratchBuf.allocatedSize + accel_uncompressed.allocatedSize * 2; @@ -627,8 +627,8 @@ bool BVHMetal::build_BLAS_hair(Progress &progress, } [accelEnc endEncoding]; - /* Estimated size of resources that will be wired for the GPU accelerated build. Accel-struct - * size is doubled to account for possible compaction step. */ + /* Estimated size of resources that will be wired for the GPU accelerated build. + * Acceleration-struct size is doubled to account for possible compaction step. */ size_t wired_size = cpBuffer.allocatedSize + radiusBuffer.allocatedSize + idxBuffer.allocatedSize + scratchBuf.allocatedSize + accel_uncompressed.allocatedSize * 2; @@ -875,8 +875,8 @@ bool BVHMetal::build_BLAS_pointcloud(Progress &progress, } [accelEnc endEncoding]; - /* Estimated size of resources that will be wired for the GPU accelerated build. Accel-struct - * size is doubled to account for possible compaction step. */ + /* Estimated size of resources that will be wired for the GPU accelerated build. + * Acceleration-struct size is doubled to account for possible compaction step. */ size_t wired_size = aabbBuf.allocatedSize + scratchBuf.allocatedSize + accel_uncompressed.allocatedSize * 2; diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm index d7e6ce3f9ef..a60d7b17852 100644 --- a/intern/cycles/device/metal/device_impl.mm +++ b/intern/cycles/device/metal/device_impl.mm @@ -349,8 +349,8 @@ string MetalDevice::preprocess_source(MetalPipelineType pso_type, case METAL_GPU_APPLE: global_defines += "#define __KERNEL_METAL_APPLE__\n"; # ifdef WITH_NANOVDB - /* Compiling in NanoVDB results in a marginal drop in render perf, so disable it for - * specialized PSOs when no textures are using it. */ + /* Compiling in NanoVDB results in a marginal drop in render performance, + * so disable it for specialized PSOs when no textures are using it. */ if ((pso_type == PSO_GENERIC || using_nanovdb) && DebugFlags().metal.use_nanovdb) { global_defines += "#define WITH_NANOVDB\n"; } diff --git a/source/blender/blenkernel/BKE_screen.hh b/source/blender/blenkernel/BKE_screen.hh index f4fac51f6e6..0a42158df85 100644 --- a/source/blender/blenkernel/BKE_screen.hh +++ b/source/blender/blenkernel/BKE_screen.hh @@ -334,9 +334,9 @@ enum { PANEL_TYPE_NO_SEARCH = (1 << 7), }; -/* uilist types */ +/* #uiList types. */ -/* Draw an item in the uiList */ +/** Draw an item in the `ui_list`. */ using uiListDrawItemFunc = void (*)(uiList *ui_list, const bContext *C, uiLayout *layout, diff --git a/source/blender/blenlib/BLI_string_search.hh b/source/blender/blenlib/BLI_string_search.hh index 219e3aa4ec7..0447211ed1a 100644 --- a/source/blender/blenlib/BLI_string_search.hh +++ b/source/blender/blenlib/BLI_string_search.hh @@ -27,7 +27,7 @@ struct SearchItem { struct RecentCache { /** - * Stores a logical time stamp for each previously choosen search item. The higher the time + * Stores a logical time stamp for each previously chosen search item. The higher the time * stamp, the more recently the item has been selected. */ Map logical_time_by_str; diff --git a/source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl b/source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl index 985b1674550..3f110c1bfc2 100644 --- a/source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl @@ -69,8 +69,8 @@ void brdf_f82_tint_lut(vec3 F0, * model at ~82°, similar to F0 and F90. * With F82-Tint, on the other hand, the value at 82° is the value of the classic Schlick * model multiplied by the tint input. - * Therefore, the factor follows by setting F82Tint(cosI) = FSchlick(cosI) - b*cosI*(1-cosI)^6 - * and F82Tint(acos(1/7)) = FSchlick(acos(1/7)) * f82_tint and solving for b. */ + * Therefore, the factor follows by setting `F82Tint(cosI) = FSchlick(cosI) - b*cosI*(1-cosI)^6` + * and `F82Tint(acos(1/7)) = FSchlick(acos(1/7)) * f82_tint` and solving for `b`. */ const float f = 6.0 / 7.0; const float f5 = (f * f) * (f * f) * f; const float f6 = (f * f) * (f * f) * (f * f); diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl index 24ba0ed3a12..5a9286a0e31 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_nodetree_lib.glsl @@ -321,8 +321,8 @@ void brdf_f82_tint_lut(vec3 F0, * model at ~82°, similar to F0 and F90. * With F82-Tint, on the other hand, the value at 82° is the value of the classic Schlick * model multiplied by the tint input. - * Therefore, the factor follows by setting F82Tint(cosI) = FSchlick(cosI) - b*cosI*(1-cosI)^6 - * and F82Tint(acos(1/7)) = FSchlick(acos(1/7)) * f82_tint and solving for b. */ + * Therefore, the factor follows by setting `F82Tint(cosI) = FSchlick(cosI) - b*cosI*(1-cosI)^6` + * and `F82Tint(acos(1/7)) = FSchlick(acos(1/7)) * f82_tint` and solving for `b`. */ const float f = 6.0 / 7.0; const float f5 = (f * f) * (f * f) * f; const float f6 = (f * f) * (f * f) * (f * f); diff --git a/source/blender/gpu/shaders/metal/mtl_shader_defines.msl b/source/blender/gpu/shaders/metal/mtl_shader_defines.msl index 41c1059c685..22685368d95 100644 --- a/source/blender/gpu/shaders/metal/mtl_shader_defines.msl +++ b/source/blender/gpu/shaders/metal/mtl_shader_defines.msl @@ -975,7 +975,7 @@ inline void _texture_write_internal_fast(thread _mtl_combined_image_sampler_3dwrite(value, uint3(_coord.xyz)); } -/* Texture atomic operations are only supported in Metal 3.1 and onwards (macOS 14.0 Sonoma). */ +/* Texture atomic operations are only supported in Metal 3.1 and onward (macOS 14.0 Sonoma). */ #if __METAL_VERSION__ >= 310 /* Image atomic operations. */