137 lines
3.2 KiB
Diff
137 lines
3.2 KiB
Diff
diff -Naur blender-4.5.2/intern/cycles/kernel/types.h blender-4.5.2-patched/intern/cycles/kernel/types.h
|
|
--- blender-4.5.2/intern/cycles/kernel/types.h 2025-08-26 12:19:37.906326100 +0300
|
|
+++ blender-4.5.2-patched/intern/cycles/kernel/types.h 2025-08-26 12:20:40.777290800 +0300
|
|
@@ -1337,7 +1337,7 @@
|
|
|
|
int motion_position;
|
|
};
|
|
-static_assert_align(KernelCamera, 16);
|
|
+// static_assert_align(KernelCamera, 16);
|
|
|
|
struct KernelFilmConvert {
|
|
int pass_offset;
|
|
@@ -1378,7 +1378,7 @@
|
|
/* Padding. */
|
|
int pad1;
|
|
};
|
|
-static_assert_align(KernelFilmConvert, 16);
|
|
+// static_assert_align(KernelFilmConvert, 16);
|
|
|
|
enum KernelBVHLayout {
|
|
BVH_LAYOUT_NONE = 0,
|
|
@@ -1437,7 +1437,7 @@
|
|
int pad1;
|
|
int pad2;
|
|
};
|
|
-static_assert_align(KernelTables, 16);
|
|
+// static_assert_align(KernelTables, 16);
|
|
|
|
struct KernelBake {
|
|
int use;
|
|
@@ -1445,7 +1445,7 @@
|
|
int tri_offset;
|
|
int use_camera;
|
|
};
|
|
-static_assert_align(KernelBake, 16);
|
|
+// static_assert_align(KernelBake, 16);
|
|
|
|
struct KernelLightLinkSet {
|
|
uint light_tree_root;
|
|
@@ -1492,7 +1492,7 @@
|
|
#endif
|
|
int pad2, pad3;
|
|
};
|
|
-static_assert_align(KernelData, 16);
|
|
+// static_assert_align(KernelData, 16);
|
|
|
|
/* Kernel data structures. */
|
|
|
|
@@ -1540,7 +1540,7 @@
|
|
uint64_t shadow_set_membership;
|
|
uint blocker_shadow_set;
|
|
};
|
|
-static_assert_align(KernelObject, 16);
|
|
+// static_assert_align(KernelObject, 16);
|
|
|
|
struct KernelCurve {
|
|
int shader_id;
|
|
@@ -1548,13 +1548,13 @@
|
|
int num_keys;
|
|
int type;
|
|
};
|
|
-static_assert_align(KernelCurve, 16);
|
|
+// static_assert_align(KernelCurve, 16);
|
|
|
|
struct KernelCurveSegment {
|
|
int prim;
|
|
int type;
|
|
};
|
|
-static_assert_align(KernelCurveSegment, 8);
|
|
+// static_assert_align(KernelCurveSegment, 8);
|
|
|
|
struct KernelSpotLight {
|
|
packed_float3 dir;
|
|
@@ -1608,7 +1608,7 @@
|
|
KernelDistantLight distant;
|
|
};
|
|
};
|
|
-static_assert_align(KernelLight, 16);
|
|
+// static_assert_align(KernelLight, 16);
|
|
|
|
struct KernelLightDistribution {
|
|
float totarea;
|
|
@@ -1616,7 +1616,7 @@
|
|
int shader_flag;
|
|
int object_id;
|
|
};
|
|
-static_assert_align(KernelLightDistribution, 16);
|
|
+// static_assert_align(KernelLightDistribution, 16);
|
|
|
|
/* Bounding box. */
|
|
struct KernelBoundingBox {
|
|
@@ -1675,7 +1675,7 @@
|
|
/* Padding. */
|
|
uint8_t pad[11];
|
|
};
|
|
-static_assert_align(KernelLightTreeNode, 16);
|
|
+// static_assert_align(KernelLightTreeNode, 16);
|
|
|
|
struct KernelLightTreeEmitter {
|
|
/* Bounding cone. */
|
|
@@ -1708,7 +1708,7 @@
|
|
/* Bit trail from root node to leaf node containing emitter. */
|
|
int bit_trail;
|
|
};
|
|
-static_assert_align(KernelLightTreeEmitter, 16);
|
|
+// static_assert_align(KernelLightTreeEmitter, 16);
|
|
|
|
struct KernelParticle {
|
|
int index;
|
|
@@ -1722,7 +1722,7 @@
|
|
float4 velocity;
|
|
float4 angular_velocity;
|
|
};
|
|
-static_assert_align(KernelParticle, 16);
|
|
+// static_assert_align(KernelParticle, 16);
|
|
|
|
struct KernelShader {
|
|
float constant_emission[3];
|
|
@@ -1731,7 +1731,7 @@
|
|
int pass_id;
|
|
int pad2, pad3;
|
|
};
|
|
-static_assert_align(KernelShader, 16);
|
|
+// static_assert_align(KernelShader, 16);
|
|
|
|
/* Patches */
|
|
|
|
@@ -1772,7 +1772,7 @@
|
|
int prim;
|
|
float u, v;
|
|
};
|
|
-static_assert_align(KernelShaderEvalInput, 16);
|
|
+// static_assert_align(KernelShaderEvalInput, 16);
|
|
|
|
/* Pre-computed sample table sizes for the tabulated Sobol sampler.
|
|
*
|