[Bf-blender-cvs] [63c985e0f71] master: Cleanup: format

Campbell Barton noreply at git.blender.org
Mon Jan 9 08:57:24 CET 2023


Commit: 63c985e0f71baabad138d75e3cf26c72c84ce917
Author: Campbell Barton
Date:   Mon Jan 9 18:56:54 2023 +1100
Branches: master
https://developer.blender.org/rB63c985e0f71baabad138d75e3cf26c72c84ce917

Cleanup: format

===================================================================

M	intern/cycles/device/metal/device_impl.mm
M	source/blender/imbuf/intern/util_gpu.c

===================================================================

diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm
index f9fa54b30ce..87614f656c3 100644
--- a/intern/cycles/device/metal/device_impl.mm
+++ b/intern/cycles/device/metal/device_impl.mm
@@ -377,7 +377,8 @@ bool MetalDevice::load_kernels(const uint _kernel_features)
 
   /* Only request generic kernels if they aren't cached in memory. */
   if (make_source_and_check_if_compile_needed(PSO_GENERIC)) {
-    /* If needed, load them asynchronously in order to responsively message progress to the user. */
+    /* If needed, load them asynchronously in order to responsively message progress to the user.
+     */
     int this_device_id = this->device_id;
     auto compile_kernels_fn = ^() {
       compile_and_load(this_device_id, PSO_GENERIC);
diff --git a/source/blender/imbuf/intern/util_gpu.c b/source/blender/imbuf/intern/util_gpu.c
index 9f4e2cf179c..eda89c7296d 100644
--- a/source/blender/imbuf/intern/util_gpu.c
+++ b/source/blender/imbuf/intern/util_gpu.c
@@ -251,12 +251,25 @@ GPUTexture *IMB_touch_gpu_texture(const char *name,
 
   GPUTexture *tex;
   if (layers > 0) {
-    tex = GPU_texture_create_2d_array_ex(
-        name, w, h, layers, 9999, tex_format, GPU_TEXTURE_USAGE_SHADER_READ | GPU_TEXTURE_USAGE_MIP_SWIZZLE_VIEW, NULL);
+    tex = GPU_texture_create_2d_array_ex(name,
+                                         w,
+                                         h,
+                                         layers,
+                                         9999,
+                                         tex_format,
+                                         GPU_TEXTURE_USAGE_SHADER_READ |
+                                             GPU_TEXTURE_USAGE_MIP_SWIZZLE_VIEW,
+                                         NULL);
   }
   else {
-    tex = GPU_texture_create_2d_ex(
-        name, w, h, 9999, tex_format, GPU_TEXTURE_USAGE_SHADER_READ | GPU_TEXTURE_USAGE_MIP_SWIZZLE_VIEW, NULL);
+    tex = GPU_texture_create_2d_ex(name,
+                                   w,
+                                   h,
+                                   9999,
+                                   tex_format,
+                                   GPU_TEXTURE_USAGE_SHADER_READ |
+                                       GPU_TEXTURE_USAGE_MIP_SWIZZLE_VIEW,
+                                   NULL);
   }
 
   GPU_texture_swizzle_set(tex, imb_gpu_get_swizzle(ibuf));



More information about the Bf-blender-cvs mailing list