@@ -234,7 +234,7 @@ struct RayDispatchGlobalData
234
234
} rt_data_info;
235
235
// In addition to the dword of padding to align `common`, we also
236
236
// add 8 dwords so Xe and Xe3 both have the same RTGlobals size.
237
- uint32_t paddingBits[1 +6 ]; // padding
237
+ uint32_t paddingBits[1 +8 ]; // padding
238
238
239
239
// HW doesn't read anything below this point.
240
240
RayDispatchGlobalDataCommon common;
@@ -286,7 +286,7 @@ struct RayDispatchGlobalData
286
286
uint32_t pad_mbz : 31 ;
287
287
uint64_t hitGroupBasePtr; // base pointer of hit group shader record array (16-bytes alignment)
288
288
uint64_t missShaderBasePtr; // base pointer of miss shader record array (8-bytes alignment)
289
- uint32_t _align_mbz[2 ]; // pad hardware section to 64 bytes
289
+ uint32_t _align_mbz[4 ]; // pad hardware section to 64 bytes
290
290
291
291
// HW doesn't read anything below this point.
292
292
RayDispatchGlobalDataCommon common;
@@ -303,7 +303,10 @@ constexpr uint32_t RTGlobalsAlign = 256;
303
303
constexpr uint32_t RTStackAlign = 128 ;
304
304
static_assert (RTStackAlign % RayDispatchGlobalData::StackChunkSize == 0 , " no?" );
305
305
306
- static_assert (sizeof (RayDispatchGlobalData) == 184 , " unexpected size?" );
306
+ static_assert ((sizeof (RayDispatchGlobalData::RT::Xe) - sizeof (RayDispatchGlobalData::RayDispatchGlobalDataCommon)) % 64 == 0 , " Unexpected GlobalData alignment" );
307
+ static_assert ((sizeof (RayDispatchGlobalData::RT::Xe3) - sizeof (RayDispatchGlobalData::RayDispatchGlobalDataCommon)) % 64 == 0 , " Unexpected GlobalData alignment" );
308
+
309
+ static_assert (sizeof (RayDispatchGlobalData) == 192 , " unexpected size?" );
307
310
static_assert (sizeof (RayDispatchGlobalData::RT::Xe) == sizeof (RayDispatchGlobalData), " unexpected size?" );
308
311
static_assert (sizeof (RayDispatchGlobalData::RT::Xe3) == sizeof (RayDispatchGlobalData), " unexpected size?" );
309
312
static_assert (offsetof(RayDispatchGlobalData::RT::Xe, common) == offsetof(RayDispatchGlobalData::RT::Xe3, common), " unexpected size?" );
0 commit comments