diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2020-10-26 20:23:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-10-28 14:43:42 +0300 |
| commit | d58b55b55a0197c397810766446f18d64a8d4a6b (patch) | |
| tree | 81f61f20e693708075e5a26ae0fde1f6b35212b2 /intern/cycles/kernel/svm | |
| parent | ee6b989f8e2ae99c28441ab8663a99bfd16b6c65 (diff) | |
Cycles: internal support for float4 geometry attributes
Previously only float3 and byte4 was supported.
Ref D2057
Diffstat (limited to 'intern/cycles/kernel/svm')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_attribute.h | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/kernel/svm/svm_attribute.h b/intern/cycles/kernel/svm/svm_attribute.h index e26a85f5b36..079aac6ae44 100644 --- a/intern/cycles/kernel/svm/svm_attribute.h +++ b/intern/cycles/kernel/svm/svm_attribute.h @@ -87,7 +87,7 @@ ccl_device void svm_node_attr(KernelGlobals *kg, ShaderData *sd, float *stack, u stack_store_float3(stack, out_offset, make_float3(f.x, f.y, 0.0f)); } } - else if (desc.type == NODE_ATTR_RGBA) { + else if (desc.type == NODE_ATTR_FLOAT4 || desc.type == NODE_ATTR_RGBA) { float4 f = primitive_surface_attribute_float4(kg, sd, desc, NULL, NULL); if (type == NODE_ATTR_FLOAT) { stack_store_float(stack, out_offset, average(float4_to_float3(f))); @@ -147,7 +147,7 @@ ccl_device void svm_node_attr_bump_dx(KernelGlobals *kg, ShaderData *sd, float * stack_store_float3(stack, out_offset, make_float3(f.x + dx.x, f.y + dx.y, 0.0f)); } } - else if (desc.type == NODE_ATTR_RGBA) { + else if (desc.type == NODE_ATTR_FLOAT4 || desc.type == NODE_ATTR_RGBA) { float4 dx; float4 f = primitive_surface_attribute_float4(kg, sd, desc, &dx, NULL); if (type == NODE_ATTR_FLOAT) { @@ -209,7 +209,7 @@ ccl_device void svm_node_attr_bump_dy(KernelGlobals *kg, ShaderData *sd, float * stack_store_float3(stack, out_offset, make_float3(f.x + dy.x, f.y + dy.y, 0.0f)); } } - else if (desc.type == NODE_ATTR_RGBA) { + else if (desc.type == NODE_ATTR_FLOAT4 || desc.type == NODE_ATTR_RGBA) { float4 dy; float4 f = primitive_surface_attribute_float4(kg, sd, desc, NULL, &dy); if (type == NODE_ATTR_FLOAT) { diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index f1ebb37e23e..cd32e0404b5 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -161,6 +161,7 @@ typedef enum NodeAttributeType { NODE_ATTR_FLOAT = 0, NODE_ATTR_FLOAT2, NODE_ATTR_FLOAT3, + NODE_ATTR_FLOAT4, NODE_ATTR_RGBA, NODE_ATTR_MATRIX } NodeAttributeType; |