Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-06-23 05:05:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-06-23 06:54:12 +0300
commit5cc8e7ab53cb20a64b8c14268fe2dba2396b4247 (patch)
tree4a33d52711c57a9ed9656898489b44ff0096a222 /intern/cycles/util
parent2c916c97ac744f5ef6ba35a6f7db68e96c4fbabc (diff)
Cleanup: reformat trailing comments that caused line wrapping
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_color.h14
-rw-r--r--intern/cycles/util/util_system.cpp4
2 files changed, 10 insertions, 8 deletions
diff --git a/intern/cycles/util/util_color.h b/intern/cycles/util/util_color.h
index 203c0b289f6..40c2c431aca 100644
--- a/intern/cycles/util/util_color.h
+++ b/intern/cycles/util/util_color.h
@@ -223,12 +223,14 @@ ccl_device_inline ssef fastpow24(const ssef &arg)
ssef x = fastpow<0x3F4CCCCD, 0x4F55A7FB>(arg); // error max = 0.17 avg = 0.0018 |avg| = 0.05
ssef arg2 = arg * arg;
ssef arg4 = arg2 * arg2;
- x = improve_5throot_solution(x,
- arg4); /* error max = 0.018 avg = 0.0031 |avg| = 0.0031 */
- x = improve_5throot_solution(x,
- arg4); /* error max = 0.00021 avg = 1.6e-05 |avg| = 1.6e-05 */
- x = improve_5throot_solution(x,
- arg4); /* error max = 6.1e-07 avg = 5.2e-08 |avg| = 1.1e-07 */
+
+ /* error max = 0.018 avg = 0.0031 |avg| = 0.0031 */
+ x = improve_5throot_solution(x, arg4);
+ /* error max = 0.00021 avg = 1.6e-05 |avg| = 1.6e-05 */
+ x = improve_5throot_solution(x, arg4);
+ /* error max = 6.1e-07 avg = 5.2e-08 |avg| = 1.1e-07 */
+ x = improve_5throot_solution(x, arg4);
+
return x * (x * x);
}
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 03bc5aea1dd..b010881058b 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -282,8 +282,8 @@ static CPUCapabilities &system_cpu_capabilities()
/* actual opcode for xgetbv */
__asm__(".byte 0x0f, 0x01, 0xd0" : "=a"(xcr_feature_mask), "=d"(edx) : "c"(0));
# elif defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK)
- xcr_feature_mask = (uint32_t)_xgetbv(
- _XCR_XFEATURE_ENABLED_MASK); /* min VS2010 SP1 compiler is required */
+ /* Minimum VS2010 SP1 compiler is required. */
+ xcr_feature_mask = (uint32_t)_xgetbv(_XCR_XFEATURE_ENABLED_MASK);
# else
xcr_feature_mask = 0;
# endif