Minor fixes

Author: sergcpp

.gitea/workflows/ci.yml

@@ -192,7 +192,7 @@ jobs:
         with:
           bin-dir: "windows-x86_64"
           out-dir: "windows-x86_64-gpu-uhd-output"
-          test-args: "--device UHD --nocpu --nodx"
+          test-args: "--device UHD --nocpu --nodx -vl 0"
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         if: always()

.gitea/workflows/release.yml

@@ -388,7 +388,7 @@ jobs:
         with:
           bin-dir: "windows-x86_64"
           out-dir: "windows-x86_64-gpu-uhd-output"
-          test-args: "--full --device UHD --nocpu --nodx"
+          test-args: "--full --device UHD --nocpu --nodx -vl 0"
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         if: always()

internal/CoreRef.cpp

@@ -1290,8 +1290,8 @@ float Ray::Ref::SampleSphericalTriangle(const fvec4 &P, const fvec4 &p1, const f
 
         // Compute the s coordinate as normalized arc length from A to C_s
         const float denom = ((v * p + u * q) * sinf(alpha));
-        const float s =
-            (1.0f / b) * portable_acosf(clamp(safe_div(((v * q - u * p) * cosf(alpha) - v), denom), -1.0f, 1.0f));
+        const float s = safe_div(1.0f, b) *
+                        portable_acosf(clamp(safe_div(((v * q - u * p) * cosf(alpha) - v), denom), -1.0f, 1.0f));
 
         // Compute the third vertex of the sub - triangle
         const fvec4 C_s = slerp(A, C, s);

internal/CoreSIMD.h

@@ -6586,7 +6586,7 @@ void Ray::NS::Evaluate_LightColor(const fvec<S> P[3], const ray_data_t<S> &ray,
             const float *light_pos = l.sph.pos;
             fvec<S> disk_normal[3] = {light_pos[0] - ray.o[0], light_pos[1] - ray.o[1], light_pos[2] - ray.o[2]};
             const fvec<S> d = normalize(disk_normal);
-            const ivec<S> mask = simd_cast(d > l.sph.radius);
+            const ivec<S> temp_mask = simd_cast(d > l.sph.radius);
 
             const fvec<S> temp = safe_sqrt(d * d - l.sph.radius * l.sph.radius);
             const fvec<S> disk_radius = (temp * l.sph.radius) / d;
@@ -6600,7 +6600,7 @@ void Ray::NS::Evaluate_LightColor(const fvec<S> P[3], const ray_data_t<S> &ray,
             const fvec<S> bsdf_pdf = ray.pdf;
 
             const fvec<S> mis_weight = power_heuristic(bsdf_pdf, light_pdf);
-            UNROLLED_FOR(i, 3, { where(mask, lcol[i]) *= mis_weight; })
+            UNROLLED_FOR(i, 3, { where(temp_mask, lcol[i]) *= mis_weight; })
 
             if (l.sph.spot > 0.0f && l.sph.blend > 0.0f) {
                 const fvec<S> _dot = -(ray.d[0] * l.sph.dir[0] + ray.d[1] * l.sph.dir[1] + ray.d[2] * l.sph.dir[2]);

internal/PMJ.cpp

@@ -106,16 +106,16 @@ Ray::aligned_vector<Ray::Ref::dvec2> Ray::GeneratePMJSamples(const unsigned int
         return Ref::dvec2{uniform_real(gen, dparam_x), uniform_real(gen, dparam_y)};
     };
 
-    auto generate_new_sample = [&](const int x_pos, const int y_pos, const int candidates) {
+    auto generate_new_sample = [&](const int sample_x_pos, const int sample_y_pos, const int candidates) {
         std::vector<int> valid_offsets_x, valid_offsets_y;
-        GetValidOffsets(x_pos, y_pos, strata, valid_offsets_x, valid_offsets_y);
+        GetValidOffsets(sample_x_pos, sample_y_pos, strata, valid_offsets_x, valid_offsets_y);
 
         if (candidates == 1) {
             return get_sample_candidate(valid_offsets_x, valid_offsets_y);
         } else {
             Ref::dvec2 best_candidate = {};
             double max_min_dist_sq = 0.0;
-            for (int i = 0; i < candidates; ++i) {
+            for (int c = 0; c < candidates; ++c) {
                 const Ref::dvec2 candidate = get_sample_candidate(valid_offsets_x, valid_offsets_y);
 
                 const int x_pos = int(candidate.get<0>() * dim), y_pos = int(candidate.get<1>() * dim);

tests/main.cpp

@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) {
         } else if (strcmp(argv[i], "--arch") == 0 && (++i != argc)) {
             preferred_arch[0] = argv[i];
         } else if (strcmp(argv[i], "-j") == 0 && (++i != argc)) {
-            threads_count = atoi(argv[++i]);
+            threads_count = atoi(argv[i]);
         } else if (strncmp(argv[i], "-j", 2) == 0) {
             threads_count = atoi(&argv[i][2]);
         } else if (strcmp(argv[i], "--time_limit") == 0 && (++i != argc)) {