Skip to content

Commit bd327ab

Browse files
fix: include NotCompressed flag in marshalling of ResourceInfo struct
Related-To: NEO-14393 Signed-off-by: Mateusz Jablonski <[email protected]> Source: fcae91c
1 parent 5442ad2 commit bd327ab

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

shared/wsl_compute_helper/source/wsl_compute_helper_types_marshall.h

+1
Original file line numberDiff line numberDiff line change
@@ -3516,6 +3516,7 @@ inline void marshall(TOKSTR_GmmResourceInfoWinStruct &dst, const GmmResourceInfo
35163516
dst.GmmResourceInfoCommon.Surf.Flags.Info.XAdapter.setValue(src.GmmResourceInfoCommon.Surf.Flags.Info.XAdapter);
35173517
dst.GmmResourceInfoCommon.Surf.Flags.Info.__PreallocatedResInfo.setValue(src.GmmResourceInfoCommon.Surf.Flags.Info.__PreallocatedResInfo);
35183518
dst.GmmResourceInfoCommon.Surf.Flags.Info.__PreWddm2SVM.setValue(src.GmmResourceInfoCommon.Surf.Flags.Info.__PreWddm2SVM);
3519+
dst.GmmResourceInfoCommon.Surf.Flags.Info.NotCompressed.setValue(src.GmmResourceInfoCommon.Surf.Flags.Info.NotCompressed);
35193520
dst.GmmResourceInfoCommon.Surf.Flags.Wa.GTMfx2ndLevelBatchRingSizeAlign.setValue(src.GmmResourceInfoCommon.Surf.Flags.Wa.GTMfx2ndLevelBatchRingSizeAlign);
35203521
dst.GmmResourceInfoCommon.Surf.Flags.Wa.ILKNeedAvcMprRowStore32KAlign.setValue(src.GmmResourceInfoCommon.Surf.Flags.Wa.ILKNeedAvcMprRowStore32KAlign);
35213522
dst.GmmResourceInfoCommon.Surf.Flags.Wa.ILKNeedAvcDmvBuffer32KAlign.setValue(src.GmmResourceInfoCommon.Surf.Flags.Wa.ILKNeedAvcDmvBuffer32KAlign);

shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens.h

+1
Original file line numberDiff line numberDiff line change
@@ -751,6 +751,7 @@ enum TOK : uint32_t {
751751
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797__XADAPTER = 3825,
752752
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797____PREALLOCATED_RES_INFO = 3826,
753753
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797____PRE_WDDM2SVM = 3827,
754+
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797__NOT_COMPRESSED = 3833,
754755
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS12521__GTMFX2ND_LEVEL_BATCH_RING_SIZE_ALIGN = 3837,
755756
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS12521__ILKNEED_AVC_MPR_ROW_STORE32KALIGN = 3838,
756757
TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS12521__ILKNEED_AVC_DMV_BUFFER32KALIGN = 3839,

shared/wsl_compute_helper/source/wsl_compute_helper_types_tokens_structs.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ struct TOKSTR_GMM_RESOURCE_FLAG_REC {
12131213
TokenVariableLength base;
12141214

12151215
TOKSTR_ANONYMOUS6797(uint16_t tokenId, uint32_t elementId = 0)
1216-
: base(tokenId, elementId, offsetof(TOKSTR_ANONYMOUS6797, __PreWddm2SVM) + sizeof(__PreWddm2SVM) - offsetof(TOKSTR_ANONYMOUS6797, AllowVirtualPadding), (sizeof(*this) - sizeof(base)) / sizeof(uint32_t)) {}
1216+
: base(tokenId, elementId, offsetof(TOKSTR_ANONYMOUS6797, NotCompressed) + sizeof(NotCompressed) - offsetof(TOKSTR_ANONYMOUS6797, AllowVirtualPadding), (sizeof(*this) - sizeof(base)) / sizeof(uint32_t)) {}
12171217

12181218
TOKSTR_ANONYMOUS6797()
12191219
: base(TOK_S_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797, 0, sizeof(*this) - sizeof(base)) {}
@@ -1258,6 +1258,7 @@ struct TOKSTR_GMM_RESOURCE_FLAG_REC {
12581258
TokenDword XAdapter = {TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797__XADAPTER};
12591259
TokenDword __PreallocatedResInfo = {TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797____PREALLOCATED_RES_INFO};
12601260
TokenDword __PreWddm2SVM = {TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797____PRE_WDDM2SVM};
1261+
TokenDword NotCompressed = {TOK_FBD_GMM_RESOURCE_FLAG_REC__ANONYMOUS6797__NOT_COMPRESSED};
12611262
};
12621263
static_assert(std::is_standard_layout_v<TOKSTR_ANONYMOUS6797>, "");
12631264
static_assert(sizeof(TOKSTR_ANONYMOUS6797) % sizeof(uint32_t) == 0, "");

0 commit comments

Comments
 (0)