griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #119141: Cycles Metal compilation errors

Browse Source 
Correct order for alignment attribute.

Pull Request: https://projects.blender.org/blender/blender/pulls/119148
This commit is contained in:
Alaska
2024-03-07 11:41:37 +01:00
committed by Brecht Van Lommel
parent 74665e0e38
commit 2a18bbbdbc
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/kernel/types.h
View File

@@ -1217,7 +1217,9 @@ typedef enum KernelBVHLayout {
} KernelBVHLayout;
/* Specialized struct that can become constants in dynamic compilation. */
#define KERNEL_STRUCT_BEGIN(name, parent) ccl_align(16) struct name {
#define KERNEL_STRUCT_BEGIN(name, parent) \
struct ccl_align(16) name \
{
#define KERNEL_STRUCT_END(name) \
} \
; \
@@ -1259,7 +1261,8 @@ typedef struct KernelLightLinkSet {
uint light_tree_root;
} KernelLightLinkSet;
typedef ccl_align(16) struct KernelData {
typedef struct ccl_align(16) KernelData
{
/* Features and limits. */
uint kernel_features;
uint max_closures;
@@ -1294,7 +1297,8 @@ typedef ccl_align(16) struct KernelData {
# endif
#endif
int pad2, pad3;
} KernelData;
}
KernelData;
static_assert_align(KernelData, 16);
/* Kernel data structures. */