[Bf-blender-cvs] [87f7b630b5c] master: Cleanup: make format
Brecht Van Lommel
noreply at git.blender.org
Thu Jan 5 19:44:42 CET 2023
Commit: 87f7b630b5cc7f792b57907e4054e3ee2f60e707
Author: Brecht Van Lommel
Date: Thu Jan 5 19:42:16 2023 +0100
Branches: master
https://developer.blender.org/rB87f7b630b5cc7f792b57907e4054e3ee2f60e707
Cleanup: make format
===================================================================
M intern/cycles/blender/device.cpp
M intern/cycles/blender/sync.cpp
M intern/cycles/device/device.h
M intern/cycles/device/metal/device_impl.mm
M intern/cycles/device/metal/kernel.mm
===================================================================
diff --git a/intern/cycles/blender/device.cpp b/intern/cycles/blender/device.cpp
index 96e7bdd03aa..9d2fba11c1a 100644
--- a/intern/cycles/blender/device.cpp
+++ b/intern/cycles/blender/device.cpp
@@ -30,7 +30,10 @@ int blender_device_threads(BL::Scene &b_scene)
return 0;
}
-DeviceInfo blender_device_info(BL::Preferences &b_preferences, BL::Scene &b_scene, bool background, bool preview)
+DeviceInfo blender_device_info(BL::Preferences &b_preferences,
+ BL::Scene &b_scene,
+ bool background,
+ bool preview)
{
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
diff --git a/intern/cycles/blender/sync.cpp b/intern/cycles/blender/sync.cpp
index 45fe4334f06..7df2a8cf30f 100644
--- a/intern/cycles/blender/sync.cpp
+++ b/intern/cycles/blender/sync.cpp
@@ -866,7 +866,8 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine &b_engine,
/* Device */
params.threads = blender_device_threads(b_scene);
- params.device = blender_device_info(b_preferences, b_scene, params.background, b_engine.is_preview());
+ params.device = blender_device_info(
+ b_preferences, b_scene, params.background, b_engine.is_preview());
/* samples */
int samples = get_int(cscene, "samples");
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 3923698b1cd..377c123b035 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -71,9 +71,9 @@ class DeviceInfo {
string description;
string id; /* used for user preferences, should stay fixed with changing hardware config */
int num;
- bool display_device; /* GPU is used as a display device. */
- bool has_nanovdb; /* Support NanoVDB volumes. */
- bool has_light_tree; /* Support light tree. */
+ bool display_device; /* GPU is used as a display device. */
+ bool has_nanovdb; /* Support NanoVDB volumes. */
+ bool has_light_tree; /* Support light tree. */
bool has_osl; /* Support Open Shading Language. */
bool has_guiding; /* Support path guiding. */
bool has_profiling; /* Supports runtime collection of profiling info. */
diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm
index 01578155931..85486c132d8 100644
--- a/intern/cycles/device/metal/device_impl.mm
+++ b/intern/cycles/device/metal/device_impl.mm
@@ -469,7 +469,8 @@ void MetalDevice::compile_and_load(int device_id, MetalPipelineType pso_type)
[options release];
- bool blocking_pso_build = (getenv("CYCLES_METAL_PROFILING") || MetalDeviceKernels::is_benchmark_warmup());
+ bool blocking_pso_build = (getenv("CYCLES_METAL_PROFILING") ||
+ MetalDeviceKernels::is_benchmark_warmup());
if (blocking_pso_build) {
MetalDeviceKernels::wait_for_all();
starttime = 0.0;
diff --git a/intern/cycles/device/metal/kernel.mm b/intern/cycles/device/metal/kernel.mm
index 7b26085c75f..e4ce5e19f63 100644
--- a/intern/cycles/device/metal/kernel.mm
+++ b/intern/cycles/device/metal/kernel.mm
@@ -124,7 +124,7 @@ DeviceShaderCache g_shaderCache[MAX_POSSIBLE_GPUS_ON_SYSTEM];
ShaderCache *get_shader_cache(id<MTLDevice> mtlDevice)
{
- for (int i=0; i<g_shaderCacheCount; i++) {
+ for (int i = 0; i < g_shaderCacheCount; i++) {
if (g_shaderCache[i].first == mtlDevice) {
return g_shaderCache[i].second.get();
}
@@ -353,7 +353,7 @@ MetalKernelPipeline *ShaderCache::get_best_pipeline(DeviceKernel kernel, const M
device->kernel_features & KERNEL_FEATURE_OBJECT_MOTION;
MetalKernelPipeline *best_pipeline = nullptr;
- while(!best_pipeline) {
+ while (!best_pipeline) {
{
thread_scoped_lock lock(cache_mutex);
for (auto &pipeline : pipelines[kernel]) {
@@ -366,7 +366,7 @@ MetalKernelPipeline *ShaderCache::get_best_pipeline(DeviceKernel kernel, const M
bool pipeline_metalrt_hair_thick = pipeline->metalrt_features & KERNEL_FEATURE_HAIR_THICK;
bool pipeline_metalrt_pointcloud = pipeline->metalrt_features & KERNEL_FEATURE_POINTCLOUD;
bool pipeline_metalrt_motion = use_metalrt &&
- pipeline->metalrt_features & KERNEL_FEATURE_OBJECT_MOTION;
+ pipeline->metalrt_features & KERNEL_FEATURE_OBJECT_MOTION;
if (pipeline->use_metalrt != use_metalrt || pipeline_metalrt_hair != device_metalrt_hair ||
pipeline_metalrt_hair_thick != device_metalrt_hair_thick ||
@@ -824,7 +824,7 @@ bool MetalDeviceKernels::load(MetalDevice *device, MetalPipelineType pso_type)
void MetalDeviceKernels::wait_for_all()
{
- for (int i=0; i<g_shaderCacheCount; i++) {
+ for (int i = 0; i < g_shaderCacheCount; i++) {
g_shaderCache[i].second->wait_for_all();
}
}
@@ -833,7 +833,7 @@ bool MetalDeviceKernels::any_specialization_happening_now()
{
/* Return true if any ShaderCaches have ongoing specialization requests (typically there will be
* only 1). */
- for (int i=0; i<g_shaderCacheCount; i++) {
+ for (int i = 0; i < g_shaderCacheCount; i++) {
if (g_shaderCache[i].second->incomplete_specialization_requests > 0) {
return true;
}
@@ -868,8 +868,8 @@ const MetalKernelPipeline *MetalDeviceKernels::get_best_pipeline(const MetalDevi
bool MetalDeviceKernels::is_benchmark_warmup()
{
NSArray *args = [[NSProcessInfo processInfo] arguments];
- for (int i = 0; i<args.count; i++) {
- if (const char* arg = [[args objectAtIndex:i] cStringUsingEncoding:NSASCIIStringEncoding]) {
+ for (int i = 0; i < args.count; i++) {
+ if (const char *arg = [[args objectAtIndex:i] cStringUsingEncoding:NSASCIIStringEncoding]) {
if (!strcmp(arg, "--warm-up")) {
return true;
}
More information about the Bf-blender-cvs
mailing list