Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: fix compiler warnings

Browse Source
This commit is contained in:
Brecht Van Lommel
2021-10-19 12:17:58 +02:00
parent c107a3c4d9
commit a395a1b36b
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/svm/svm_ao.h
View File

@@ -110,13 +110,13 @@ ccl_device_noinline
uint color_offset, out_color_offset, samples; uint color_offset, out_color_offset, samples;
svm_unpack_node_uchar3(node.z, &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; float ao = 1.0f;
IF_KERNEL_NODES_FEATURE(RAYTRACE) 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__ # ifdef __KERNEL_OPTIX__
ao = optixDirectCall<float>(0, kg, state, sd, normal, dist, samples, flags); ao = optixDirectCall<float>(0, kg, state, sd, normal, dist, samples, flags);
# else # else

6
intern/cycles/kernel/svm/svm_aov.h
View File

@@ -34,10 +34,9 @@ ccl_device void svm_node_aov_color(KernelGlobals kg,
uint4 node, uint4 node,
ccl_global float *render_buffer) ccl_global float *render_buffer)
{ {
float3 val = stack_load_float3(stack, node.y);
IF_KERNEL_NODES_FEATURE(AOV) 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 uint32_t render_pixel_index = INTEGRATOR_STATE(state, path, render_pixel_index);
const uint64_t render_buffer_offset = (uint64_t)render_pixel_index * const uint64_t render_buffer_offset = (uint64_t)render_pixel_index *
kernel_data.film.pass_stride; kernel_data.film.pass_stride;
@@ -55,10 +54,9 @@ ccl_device void svm_node_aov_value(KernelGlobals kg,
uint4 node, uint4 node,
ccl_global float *render_buffer) ccl_global float *render_buffer)
{ {
float val = stack_load_float(stack, node.y);
IF_KERNEL_NODES_FEATURE(AOV) 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 uint32_t render_pixel_index = INTEGRATOR_STATE(state, path, render_pixel_index);
const uint64_t render_buffer_offset = (uint64_t)render_pixel_index * const uint64_t render_buffer_offset = (uint64_t)render_pixel_index *
kernel_data.film.pass_stride; kernel_data.film.pass_stride;

4
intern/cycles/kernel/svm/svm_bevel.h
View File

@@ -298,12 +298,12 @@ ccl_device_noinline
uint num_samples, radius_offset, normal_offset, out_offset; uint num_samples, radius_offset, normal_offset, out_offset;
svm_unpack_node_uchar4(node.y, &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; float3 bevel_N = sd->N;
IF_KERNEL_NODES_FEATURE(RAYTRACE) IF_KERNEL_NODES_FEATURE(RAYTRACE)
{ {
float radius = stack_load_float(stack, radius_offset);
# ifdef __KERNEL_OPTIX__ # ifdef __KERNEL_OPTIX__
bevel_N = optixDirectCall<float3>(1, kg, state, sd, radius, num_samples); bevel_N = optixDirectCall<float3>(1, kg, state, sd, radius, num_samples);
# else # else