diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-10-19 13:17:58 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-19 13:59:05 +0300 |
commit | a395a1b36b9f2dfb32408a1150844312ab62b0b3 (patch) | |
tree | 00409daffee897ce7f801bc7a3c3a92149cbff63 /intern/cycles | |
parent | c107a3c4d9a540a287e21c517d353b670a71a0b5 (diff) |
Cleanup: fix compiler warnings
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/svm/svm_ao.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_aov.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_bevel.h | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/intern/cycles/kernel/svm/svm_ao.h b/intern/cycles/kernel/svm/svm_ao.h index 18d60c43b12..a1efd2f0a43 100644 --- a/intern/cycles/kernel/svm/svm_ao.h +++ b/intern/cycles/kernel/svm/svm_ao.h @@ -110,13 +110,13 @@ ccl_device_noinline uint color_offset, out_color_offset, samples; svm_unpack_node_uchar3(node.z, &color_offset, &out_color_offset, &samples); - float dist = stack_load_float_default(stack, dist_offset, node.w); - float3 normal = stack_valid(normal_offset) ? stack_load_float3(stack, normal_offset) : sd->N; - float ao = 1.0f; IF_KERNEL_NODES_FEATURE(RAYTRACE) { + float dist = stack_load_float_default(stack, dist_offset, node.w); + float3 normal = stack_valid(normal_offset) ? stack_load_float3(stack, normal_offset) : sd->N; + # ifdef __KERNEL_OPTIX__ ao = optixDirectCall<float>(0, kg, state, sd, normal, dist, samples, flags); # else diff --git a/intern/cycles/kernel/svm/svm_aov.h b/intern/cycles/kernel/svm/svm_aov.h index a18567fdc3c..0d6395d52c0 100644 --- a/intern/cycles/kernel/svm/svm_aov.h +++ b/intern/cycles/kernel/svm/svm_aov.h @@ -34,10 +34,9 @@ ccl_device void svm_node_aov_color(KernelGlobals kg, uint4 node, ccl_global float *render_buffer) { - float3 val = stack_load_float3(stack, node.y); - IF_KERNEL_NODES_FEATURE(AOV) { + const float3 val = stack_load_float3(stack, node.y); const uint32_t render_pixel_index = INTEGRATOR_STATE(state, path, render_pixel_index); const uint64_t render_buffer_offset = (uint64_t)render_pixel_index * kernel_data.film.pass_stride; @@ -55,10 +54,9 @@ ccl_device void svm_node_aov_value(KernelGlobals kg, uint4 node, ccl_global float *render_buffer) { - float val = stack_load_float(stack, node.y); - IF_KERNEL_NODES_FEATURE(AOV) { + const float val = stack_load_float(stack, node.y); const uint32_t render_pixel_index = INTEGRATOR_STATE(state, path, render_pixel_index); const uint64_t render_buffer_offset = (uint64_t)render_pixel_index * kernel_data.film.pass_stride; diff --git a/intern/cycles/kernel/svm/svm_bevel.h b/intern/cycles/kernel/svm/svm_bevel.h index 197562434f9..3ce3af20795 100644 --- a/intern/cycles/kernel/svm/svm_bevel.h +++ b/intern/cycles/kernel/svm/svm_bevel.h @@ -298,12 +298,12 @@ ccl_device_noinline uint num_samples, radius_offset, normal_offset, out_offset; svm_unpack_node_uchar4(node.y, &num_samples, &radius_offset, &normal_offset, &out_offset); - float radius = stack_load_float(stack, radius_offset); - float3 bevel_N = sd->N; IF_KERNEL_NODES_FEATURE(RAYTRACE) { + float radius = stack_load_float(stack, radius_offset); + # ifdef __KERNEL_OPTIX__ bevel_N = optixDirectCall<float3>(1, kg, state, sd, radius, num_samples); # else |