diff options
author | Michael Jones <michael_p_jones@apple.com> | 2021-10-14 15:53:40 +0300 |
---|---|---|
committer | Michael Jones <michael_p_jones@apple.com> | 2021-10-14 18:14:43 +0300 |
commit | a0f269f682dab848afc80cd322d04a0c4a815cae (patch) | |
tree | 0978b1888273fbaa2d14550bde484c5247fa89ff /intern/cycles/kernel/geom/geom_motion_triangle.h | |
parent | 47caeb8c26686e24ea7e694f94fabee44f3d2dca (diff) |
Cycles: Kernel address space changes for MSL
This is the first of a sequence of changes to support compiling Cycles kernels as MSL (Metal Shading Language) in preparation for a Metal GPU device implementation.
MSL requires that all pointer types be declared with explicit address space attributes (device, thread, etc...). There is already precedent for this with Cycles' address space macros (ccl_global, ccl_private, etc...), therefore the first step of MSL-enablement is to apply these consistently. Line-for-line this represents the largest change required to enable MSL. Applying this change first will simplify future patches as well as offering the emergent benefit of enhanced descriptiveness.
The vast majority of deltas in this patch fall into one of two cases:
- Ensuring ccl_private is specified for thread-local pointer types
- Ensuring ccl_global is specified for device-wide pointer types
Additionally, the ccl_addr_space qualifier can be removed. Prior to Cycles X, ccl_addr_space was used as a context-dependent address space qualifier, but now it is either redundant (e.g. in struct typedefs), or can be replaced by ccl_global in the case of pointer types. Associated function variants (e.g. lcg_step_float_addrspace) are also redundant.
In cases where address space qualifiers are chained with "const", this patch places the address space qualifier first. The rationale for this is that the choice of address space is likely to have the greater impact on runtime performance and overall architecture.
The final part of this patch is the addition of a metal/compat.h header. This is partially complete and will be extended in future patches, paving the way for the full Metal implementation.
Ref T92212
Reviewed By: brecht
Maniphest Tasks: T92212
Differential Revision: https://developer.blender.org/D12864
Diffstat (limited to 'intern/cycles/kernel/geom/geom_motion_triangle.h')
-rw-r--r-- | intern/cycles/kernel/geom/geom_motion_triangle.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle.h b/intern/cycles/kernel/geom/geom_motion_triangle.h index b7f182090aa..161b358110d 100644 --- a/intern/cycles/kernel/geom/geom_motion_triangle.h +++ b/intern/cycles/kernel/geom/geom_motion_triangle.h @@ -31,10 +31,10 @@ CCL_NAMESPACE_BEGIN /* Time interpolation of vertex positions and normals */ -ccl_device_inline int find_attribute_motion(const KernelGlobals *kg, +ccl_device_inline int find_attribute_motion(ccl_global const KernelGlobals *kg, int object, uint id, - AttributeElement *elem) + ccl_private AttributeElement *elem) { /* todo: find a better (faster) solution for this, maybe store offset per object */ uint attr_offset = object_attribute_map_offset(kg, object); @@ -62,7 +62,7 @@ ccl_device_inline int find_attribute_motion(const KernelGlobals *kg, return (attr_map.y == ATTR_ELEMENT_NONE) ? (int)ATTR_STD_NOT_FOUND : (int)attr_map.z; } -ccl_device_inline void motion_triangle_verts_for_step(const KernelGlobals *kg, +ccl_device_inline void motion_triangle_verts_for_step(ccl_global const KernelGlobals *kg, uint4 tri_vindex, int offset, int numverts, @@ -89,7 +89,7 @@ ccl_device_inline void motion_triangle_verts_for_step(const KernelGlobals *kg, } } -ccl_device_inline void motion_triangle_normals_for_step(const KernelGlobals *kg, +ccl_device_inline void motion_triangle_normals_for_step(ccl_global const KernelGlobals *kg, uint4 tri_vindex, int offset, int numverts, @@ -117,7 +117,7 @@ ccl_device_inline void motion_triangle_normals_for_step(const KernelGlobals *kg, } ccl_device_inline void motion_triangle_vertices( - const KernelGlobals *kg, int object, int prim, float time, float3 verts[3]) + ccl_global const KernelGlobals *kg, int object, int prim, float time, float3 verts[3]) { /* get motion info */ int numsteps, numverts; @@ -146,8 +146,13 @@ ccl_device_inline void motion_triangle_vertices( verts[2] = (1.0f - t) * verts[2] + t * next_verts[2]; } -ccl_device_inline float3 motion_triangle_smooth_normal( - const KernelGlobals *kg, float3 Ng, int object, int prim, float u, float v, float time) +ccl_device_inline float3 motion_triangle_smooth_normal(ccl_global const KernelGlobals *kg, + float3 Ng, + int object, + int prim, + float u, + float v, + float time) { /* get motion info */ int numsteps, numverts; |