diff options
author | Ethan-Hall <Ethan1080> | 2022-03-23 17:53:10 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-03-23 22:06:12 +0300 |
commit | f5066d43ae572de929fea31cbc9e091e288b2435 (patch) | |
tree | c585a7551aae6b899064e88b570046f606a76f7a /intern/cycles/kernel/geom | |
parent | 4e56e738a8f35228873d6e84d9e9f8b0e7a74a59 (diff) |
Cleanup: use make_float4(f) zero_float4() to simplify code
Differential Revision: https://developer.blender.org/D14426
Diffstat (limited to 'intern/cycles/kernel/geom')
-rw-r--r-- | intern/cycles/kernel/geom/curve.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/patch.h | 12 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/point.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/primitive.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/subd_triangle.h | 14 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/triangle.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/geom/volume.h | 2 |
7 files changed, 28 insertions, 28 deletions
diff --git a/intern/cycles/kernel/geom/curve.h b/intern/cycles/kernel/geom/curve.h index 79366f11082..4dbc6d4f6db 100644 --- a/intern/cycles/kernel/geom/curve.h +++ b/intern/cycles/kernel/geom/curve.h @@ -164,7 +164,7 @@ ccl_device float4 curve_attribute_float4(KernelGlobals kg, if (dx) *dx = sd->du.dx * (f1 - f0); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); # endif return (1.0f - sd->u) * f0 + sd->u * f1; @@ -172,9 +172,9 @@ ccl_device float4 curve_attribute_float4(KernelGlobals kg, else { # ifdef __RAY_DIFFERENTIALS__ if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); # endif if (desc.element & (ATTR_ELEMENT_CURVE | ATTR_ELEMENT_OBJECT | ATTR_ELEMENT_MESH)) { @@ -183,7 +183,7 @@ ccl_device float4 curve_attribute_float4(KernelGlobals kg, return kernel_tex_fetch(__attributes_float4, offset); } else { - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + return zero_float4(); } } } diff --git a/intern/cycles/kernel/geom/patch.h b/intern/cycles/kernel/geom/patch.h index 9a006baf7bf..1c63a00e30d 100644 --- a/intern/cycles/kernel/geom/patch.h +++ b/intern/cycles/kernel/geom/patch.h @@ -391,11 +391,11 @@ ccl_device float4 patch_eval_float4(KernelGlobals kg, int num_control = patch_eval_control_verts( kg, sd->object, patch, u, v, channel, indices, weights, weights_du, weights_dv); - float4 val = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + float4 val = zero_float4(); if (du) - *du = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *du = zero_float4(); if (dv) - *dv = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dv = zero_float4(); for (int i = 0; i < num_control; i++) { float4 v = kernel_tex_fetch(__attributes_float4, offset + indices[i]); @@ -428,11 +428,11 @@ ccl_device float4 patch_eval_uchar4(KernelGlobals kg, int num_control = patch_eval_control_verts( kg, sd->object, patch, u, v, channel, indices, weights, weights_du, weights_dv); - float4 val = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + float4 val = zero_float4(); if (du) - *du = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *du = zero_float4(); if (dv) - *dv = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dv = zero_float4(); for (int i = 0; i < num_control; i++) { float4 v = color_srgb_to_linear_v4( diff --git a/intern/cycles/kernel/geom/point.h b/intern/cycles/kernel/geom/point.h index 041ecb3c2cf..ee7eca9e0c6 100644 --- a/intern/cycles/kernel/geom/point.h +++ b/intern/cycles/kernel/geom/point.h @@ -83,16 +83,16 @@ ccl_device float4 point_attribute_float4(KernelGlobals kg, { # ifdef __RAY_DIFFERENTIALS__ if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); # endif if (desc.element == ATTR_ELEMENT_VERTEX) { return kernel_tex_fetch(__attributes_float4, desc.offset + sd->prim); } else { - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + return zero_float4(); } } diff --git a/intern/cycles/kernel/geom/primitive.h b/intern/cycles/kernel/geom/primitive.h index 63d1168364c..9b4b61fbd84 100644 --- a/intern/cycles/kernel/geom/primitive.h +++ b/intern/cycles/kernel/geom/primitive.h @@ -135,10 +135,10 @@ ccl_device_forceinline float4 primitive_surface_attribute_float4(KernelGlobals k #endif else { if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); + return zero_float4(); } } @@ -187,7 +187,7 @@ ccl_device_inline float4 primitive_volume_attribute_float4(KernelGlobals kg, return volume_attribute_float4(kg, sd, desc); } else { - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + return zero_float4(); } } #endif diff --git a/intern/cycles/kernel/geom/subd_triangle.h b/intern/cycles/kernel/geom/subd_triangle.h index 0ff5292b5b5..24e1e454b8c 100644 --- a/intern/cycles/kernel/geom/subd_triangle.h +++ b/intern/cycles/kernel/geom/subd_triangle.h @@ -566,9 +566,9 @@ ccl_device_noinline float4 subd_triangle_attribute_float4(KernelGlobals kg, #endif /* __PATCH_EVAL__ */ if (desc.element == ATTR_ELEMENT_FACE) { if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); return kernel_tex_fetch(__attributes_float4, desc.offset + subd_triangle_patch_face(kg, patch)); @@ -648,19 +648,19 @@ ccl_device_noinline float4 subd_triangle_attribute_float4(KernelGlobals kg, } else if (desc.element == ATTR_ELEMENT_OBJECT || desc.element == ATTR_ELEMENT_MESH) { if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); return kernel_tex_fetch(__attributes_float4, desc.offset); } else { if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + return zero_float4(); } } diff --git a/intern/cycles/kernel/geom/triangle.h b/intern/cycles/kernel/geom/triangle.h index 865bf549ae3..8ac7e67ff05 100644 --- a/intern/cycles/kernel/geom/triangle.h +++ b/intern/cycles/kernel/geom/triangle.h @@ -338,9 +338,9 @@ ccl_device float4 triangle_attribute_float4(KernelGlobals kg, else { #ifdef __RAY_DIFFERENTIALS__ if (dx) - *dx = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dx = zero_float4(); if (dy) - *dy = make_float4(0.0f, 0.0f, 0.0f, 0.0f); + *dy = zero_float4(); #endif if (desc.element & (ATTR_ELEMENT_FACE | ATTR_ELEMENT_OBJECT | ATTR_ELEMENT_MESH)) { @@ -349,7 +349,7 @@ ccl_device float4 triangle_attribute_float4(KernelGlobals kg, return kernel_tex_fetch(__attributes_float4, offset); } else { - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + return zero_float4(); } } } diff --git a/intern/cycles/kernel/geom/volume.h b/intern/cycles/kernel/geom/volume.h index aa6f3b42bf2..22715dee5bf 100644 --- a/intern/cycles/kernel/geom/volume.h +++ b/intern/cycles/kernel/geom/volume.h @@ -75,7 +75,7 @@ ccl_device float4 volume_attribute_float4(KernelGlobals kg, return kernel_tex_image_interp_3d(kg, desc.offset, P, interp); } else { - return make_float4(0.0f, 0.0f, 0.0f, 0.0f); + return zero_float4(); } } |