diff options
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_aov.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_closure.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_light_path.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_tex_coord.h | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 9692308c496..57879dc238f 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -230,7 +230,7 @@ ccl_device void svm_eval_nodes(KernelGlobals kg, ConstIntegratorState state, ShaderData *sd, ccl_global float *render_buffer, - int path_flag) + uint32_t path_flag) { float stack[SVM_STACK_SIZE]; int offset = sd->shader & SHADER_MASK; diff --git a/intern/cycles/kernel/svm/svm_aov.h b/intern/cycles/kernel/svm/svm_aov.h index d09eaa61cc0..aba5bdc0113 100644 --- a/intern/cycles/kernel/svm/svm_aov.h +++ b/intern/cycles/kernel/svm/svm_aov.h @@ -18,7 +18,7 @@ CCL_NAMESPACE_BEGIN -ccl_device_inline bool svm_node_aov_check(const int path_flag, ccl_global float *render_buffer) +ccl_device_inline bool svm_node_aov_check(const uint32_t path_flag, ccl_global float *render_buffer) { bool is_primary = (path_flag & PATH_RAY_CAMERA) && (!(path_flag & PATH_RAY_SINGLE_PASS_DONE)); diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h index fb10288da72..3378832c233 100644 --- a/intern/cycles/kernel/svm/svm_closure.h +++ b/intern/cycles/kernel/svm/svm_closure.h @@ -79,7 +79,7 @@ ccl_device_noinline int svm_node_closure_bsdf(KernelGlobals kg, ccl_private ShaderData *sd, ccl_private float *stack, uint4 node, - int path_flag, + uint32_t path_flag, int offset) { uint type, param1_offset, param2_offset; @@ -1015,7 +1015,7 @@ ccl_device_noinline int svm_node_principled_volume(KernelGlobals kg, ccl_private ShaderData *sd, ccl_private float *stack, uint4 node, - int path_flag, + uint32_t path_flag, int offset) { #ifdef __VOLUME__ diff --git a/intern/cycles/kernel/svm/svm_light_path.h b/intern/cycles/kernel/svm/svm_light_path.h index 955a1f23379..c61ace9757a 100644 --- a/intern/cycles/kernel/svm/svm_light_path.h +++ b/intern/cycles/kernel/svm/svm_light_path.h @@ -25,7 +25,7 @@ ccl_device_noinline void svm_node_light_path(KernelGlobals kg, ccl_private float *stack, uint type, uint out_offset, - int path_flag) + uint32_t path_flag) { float info = 0.0f; diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h b/intern/cycles/kernel/svm/svm_tex_coord.h index 657a4bb32a8..fe777eb34c8 100644 --- a/intern/cycles/kernel/svm/svm_tex_coord.h +++ b/intern/cycles/kernel/svm/svm_tex_coord.h @@ -24,7 +24,7 @@ CCL_NAMESPACE_BEGIN ccl_device_noinline int svm_node_tex_coord(KernelGlobals kg, ccl_private ShaderData *sd, - int path_flag, + uint32_t path_flag, ccl_private float *stack, uint4 node, int offset) @@ -105,7 +105,7 @@ ccl_device_noinline int svm_node_tex_coord(KernelGlobals kg, ccl_device_noinline int svm_node_tex_coord_bump_dx(KernelGlobals kg, ccl_private ShaderData *sd, - int path_flag, + uint32_t path_flag, ccl_private float *stack, uint4 node, int offset) @@ -190,7 +190,7 @@ ccl_device_noinline int svm_node_tex_coord_bump_dx(KernelGlobals kg, ccl_device_noinline int svm_node_tex_coord_bump_dy(KernelGlobals kg, ccl_private ShaderData *sd, - int path_flag, + uint32_t path_flag, ccl_private float *stack, uint4 node, int offset) |