diff --git a/cmrtlib/agnostic/share/cm_hw_vebox_cmd_g10.h b/cmrtlib/agnostic/share/cm_hw_vebox_cmd_g10.h index a9af78f2e67..2cdb2285be6 100644 --- a/cmrtlib/agnostic/share/cm_hw_vebox_cmd_g10.h +++ b/cmrtlib/agnostic/share/cm_hw_vebox_cmd_g10.h @@ -20,11 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class CmHwVeboxCmdG10 { public: diff --git a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_hpm.h b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_hpm.h index 42f7fa206f4..e7f1d1918b6 100644 --- a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_hpm.h +++ b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_hpm.h @@ -41,11 +41,12 @@ #endif #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_hpm.h b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_hpm.h index 5ea2917eec8..f6086a7f9b4 100644 --- a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_hpm.h +++ b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_hpm.h @@ -36,11 +36,12 @@ #include "mhw_hwcmd.h" #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_hpm.h b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_hpm.h index 72b35552992..526bb8c3b2f 100644 --- a/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_hpm.h +++ b/media_driver/agnostic/Xe_M/Xe_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_hpm.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_HUC_HWCMD_XE_HPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_mi_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_mi_hwcmd_xe_xpm.h index 9815529ba07..230de614b06 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_mi_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_mi_hwcmd_xe_xpm.h @@ -35,11 +35,12 @@ #define __MHW_MI_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_mi_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_sfc_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_sfc_hwcmd_xe_xpm.h index 1e0265d0826..5c484a59f3e 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_sfc_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_sfc_hwcmd_xe_xpm.h @@ -34,11 +34,12 @@ #define __MHW_SFC_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_sfc_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_state_heap_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_state_heap_hwcmd_xe_xpm.h index 31f19d63fe4..7ceba4071cf 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_state_heap_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_state_heap_hwcmd_xe_xpm.h @@ -35,11 +35,12 @@ #define __MHW_STATE_HEAP_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_state_heap_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_hwcmd_xe_xpm.h index a750c5eae01..c50c89ae01b 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/mhw_vebox_hwcmd_xe_xpm.h @@ -31,11 +31,12 @@ #define __MHW_VEBOX_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vebox_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_xpm.h index df1cf8d8295..f6f599973d7 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_xpm.h @@ -35,11 +35,12 @@ #define __MHW_VDBOX_AVP_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_avp_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm.h index 50a504c54eb..16e24f9cab2 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm.h @@ -34,11 +34,12 @@ #define __MHW_VDBOX_HCP_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_xpm.h b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_xpm.h index 0409df5ceae..046fa135e51 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_xpm.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_xpm.h @@ -31,11 +31,12 @@ #define __MHW_VDBOX_MFX_HWCMD_XE_XPM_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_xe_xpm { public: diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm_plus.h b/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm_plus.h index f1eb218f02d..61d560e4feb 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm_plus.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_xpm_plus.h @@ -36,11 +36,12 @@ #include "mhw_hwcmd.h" #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_xpm_plus.h b/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_xpm_plus.h index 93d4bb41b87..534f220f779 100644 --- a/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_xpm_plus.h +++ b/media_driver/agnostic/Xe_M/Xe_XPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_xpm_plus.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_HUC_HWCMD_XE_XPM_PLUS_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_driver/agnostic/Xe_R/Xe_HP_base/hw/render/mhw_render_hwcmd_xe_hp_base.h b/media_driver/agnostic/Xe_R/Xe_HP_base/hw/render/mhw_render_hwcmd_xe_hp_base.h index f0ec211418a..094065cd800 100644 --- a/media_driver/agnostic/Xe_R/Xe_HP_base/hw/render/mhw_render_hwcmd_xe_hp_base.h +++ b/media_driver/agnostic/Xe_R/Xe_HP_base/hw/render/mhw_render_hwcmd_xe_hp_base.h @@ -35,11 +35,12 @@ #define __MHW_RENDER_HWCMD_XE_HP_BASE_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_render_xe_xpm_base { public: diff --git a/media_driver/agnostic/common/hw/mhw_vebox_hwcmd_g9_X.h b/media_driver/agnostic/common/hw/mhw_vebox_hwcmd_g9_X.h index d9a7cc6cf58..2bf301926c3 100644 --- a/media_driver/agnostic/common/hw/mhw_vebox_hwcmd_g9_X.h +++ b/media_driver/agnostic/common/hw/mhw_vebox_hwcmd_g9_X.h @@ -29,11 +29,12 @@ #define __MHW_VEBOX_HWCMD_G9_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vebox_g9_X { public: diff --git a/media_driver/agnostic/g12/g12_base/hw/render/mhw_render_hwcmd_g12_X.h b/media_driver/agnostic/g12/g12_base/hw/render/mhw_render_hwcmd_g12_X.h index 093e7dc08c3..113223ebfe5 100644 --- a/media_driver/agnostic/g12/g12_base/hw/render/mhw_render_hwcmd_g12_X.h +++ b/media_driver/agnostic/g12/g12_base/hw/render/mhw_render_hwcmd_g12_X.h @@ -29,11 +29,12 @@ #define __MHW_RENDER_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_render_g12_X { public: diff --git a/media_driver/agnostic/gen11/hw/mhw_mi_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/mhw_mi_hwcmd_g11_X.h index 47721c75cc8..e229981eb3c 100644 --- a/media_driver/agnostic/gen11/hw/mhw_mi_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/mhw_mi_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_MI_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_mi_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/mhw_render_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/mhw_render_hwcmd_g11_X.h index b6e32075bd4..121cdb37906 100644 --- a/media_driver/agnostic/gen11/hw/mhw_render_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/mhw_render_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_RENDER_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_render_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/mhw_sfc_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/mhw_sfc_hwcmd_g11_X.h index d42fad034c3..3cacd9a7aab 100644 --- a/media_driver/agnostic/gen11/hw/mhw_sfc_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/mhw_sfc_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_SFC_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_sfc_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/mhw_state_heap_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/mhw_state_heap_hwcmd_g11_X.h index f1aafdd7c37..2504ce8f757 100644 --- a/media_driver/agnostic/gen11/hw/mhw_state_heap_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/mhw_state_heap_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_STATE_HEAP_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_state_heap_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/mhw_vebox_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/mhw_vebox_hwcmd_g11_X.h index a0dd6ed354a..521b6f238f2 100644 --- a/media_driver/agnostic/gen11/hw/mhw_vebox_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/mhw_vebox_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_VEBOX_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vebox_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_hcp_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_hcp_hwcmd_g11_X.h index 087ef0a97d3..ef34d42dba2 100644 --- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_hcp_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_hcp_hwcmd_g11_X.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HCP_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_huc_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_huc_hwcmd_g11_X.h index 07ba57bbc12..246b22c2d2f 100644 --- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_huc_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_huc_hwcmd_g11_X.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HUC_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_huc_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_hwcmd_g11_X.h index 9db576c66f3..91d9a6062ae 100644 --- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_mfx_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_MFX_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_g11_X { public: diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g11_X.h index 0bc09a75b66..05220d35b94 100644 --- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g11_X.h +++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g11_X.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_VDENC_HWCMD_G11_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_vdenc_g11_X { public: diff --git a/media_driver/agnostic/gen12/hw/mhw_mi_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_mi_hwcmd_g12_X.h index f6e4ba27959..74ab412aff0 100644 --- a/media_driver/agnostic/gen12/hw/mhw_mi_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/mhw_mi_hwcmd_g12_X.h @@ -23,11 +23,12 @@ #define __MHW_MI_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_mi_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/mhw_sfc_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_sfc_hwcmd_g12_X.h index bdcccca49cf..72ee44291fc 100644 --- a/media_driver/agnostic/gen12/hw/mhw_sfc_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/mhw_sfc_hwcmd_g12_X.h @@ -29,11 +29,12 @@ #define __MHW_SFC_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_sfc_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/mhw_state_heap_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_state_heap_hwcmd_g12_X.h index 75b2c219641..fbacc3597bf 100644 --- a/media_driver/agnostic/gen12/hw/mhw_state_heap_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/mhw_state_heap_hwcmd_g12_X.h @@ -32,11 +32,12 @@ #define __MHW_STATE_HEAP_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_state_heap_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/mhw_vebox_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/mhw_vebox_hwcmd_g12_X.h index 1de446e479d..64f73f6b8ee 100644 --- a/media_driver/agnostic/gen12/hw/mhw_vebox_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/mhw_vebox_hwcmd_g12_X.h @@ -29,11 +29,12 @@ #define __MHW_VEBOX_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_vebox_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_hwcmd_g12_X.h index abb88b4b5f3..371294f3fe3 100644 --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_hwcmd_g12_X.h @@ -32,11 +32,12 @@ #define __MHW_AVP_HWCMD_G12_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_avp_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_hcp_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_hcp_hwcmd_g12_X.h index 14d17d0269d..d81120a4f0c 100644 --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_hcp_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_hcp_hwcmd_g12_X.h @@ -34,11 +34,12 @@ OTHER DEALINGS IN THE SOFTWARE. #define __MHW_VDBOX_HCP_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_hwcmd_g12_X.h index 4ecfd9f96a7..941f1a9bae0 100644 --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_huc_hwcmd_g12_X.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HUC_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_huc_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_hwcmd_g12_X.h index e49945fe92b..3dcdddc544b 100644 --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_mfx_hwcmd_g12_X.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_MFX_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_g12_X { public: diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g12_X.h b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g12_X.h index 9f11152892e..66f6b4a8df1 100644 --- a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g12_X.h +++ b/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g12_X.h @@ -31,11 +31,12 @@ OTHER DEALINGS IN THE SOFTWARE. #define __MHW_VDBOX_VDENC_HWCMD_G12_X_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_vdenc_g12_X { public: diff --git a/media_driver/agnostic/gen8/hw/mhw_mi_hwcmd_g8_X.h b/media_driver/agnostic/gen8/hw/mhw_mi_hwcmd_g8_X.h index 20212e65884..6f7e58e930b 100644 --- a/media_driver/agnostic/gen8/hw/mhw_mi_hwcmd_g8_X.h +++ b/media_driver/agnostic/gen8/hw/mhw_mi_hwcmd_g8_X.h @@ -29,11 +29,12 @@ #define __MHW_MI_HWCMD_G8_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_mi_g8_X { public: diff --git a/media_driver/agnostic/gen8/hw/mhw_render_hwcmd_g8_X.h b/media_driver/agnostic/gen8/hw/mhw_render_hwcmd_g8_X.h index a538e4d45c8..469e16d3c30 100644 --- a/media_driver/agnostic/gen8/hw/mhw_render_hwcmd_g8_X.h +++ b/media_driver/agnostic/gen8/hw/mhw_render_hwcmd_g8_X.h @@ -29,11 +29,12 @@ #define __MHW_RENDER_HWCMD_G8_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_render_g8_X { public: diff --git a/media_driver/agnostic/gen8/hw/mhw_state_heap_hwcmd_g8_X.h b/media_driver/agnostic/gen8/hw/mhw_state_heap_hwcmd_g8_X.h index b18c0bb392d..efd54b6cd0b 100644 --- a/media_driver/agnostic/gen8/hw/mhw_state_heap_hwcmd_g8_X.h +++ b/media_driver/agnostic/gen8/hw/mhw_state_heap_hwcmd_g8_X.h @@ -29,11 +29,12 @@ #define __MHW_STATE_HEAP_HWCMD_G8_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_state_heap_g8_X { public: diff --git a/media_driver/agnostic/gen8/hw/mhw_vebox_hwcmd_g8_X.h b/media_driver/agnostic/gen8/hw/mhw_vebox_hwcmd_g8_X.h index 8afade20fa4..c086a6cba97 100644 --- a/media_driver/agnostic/gen8/hw/mhw_vebox_hwcmd_g8_X.h +++ b/media_driver/agnostic/gen8/hw/mhw_vebox_hwcmd_g8_X.h @@ -29,11 +29,12 @@ #define __MHW_VEBOX_HWCMD_G8_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_vebox_g8_X { public: diff --git a/media_driver/agnostic/gen8_bdw/hw/vdbox/mhw_vdbox_mfx_hwcmd_g8_bdw.h b/media_driver/agnostic/gen8_bdw/hw/vdbox/mhw_vdbox_mfx_hwcmd_g8_bdw.h index edc09364c51..96b494520a3 100644 --- a/media_driver/agnostic/gen8_bdw/hw/vdbox/mhw_vdbox_mfx_hwcmd_g8_bdw.h +++ b/media_driver/agnostic/gen8_bdw/hw/vdbox/mhw_vdbox_mfx_hwcmd_g8_bdw.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_MFX_HWCMD_G8_BDW_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_g8_bdw { public: diff --git a/media_driver/agnostic/gen9/hw/mhw_mi_hwcmd_g9_X.h b/media_driver/agnostic/gen9/hw/mhw_mi_hwcmd_g9_X.h index e12e1c5a77a..370a8202ca0 100644 --- a/media_driver/agnostic/gen9/hw/mhw_mi_hwcmd_g9_X.h +++ b/media_driver/agnostic/gen9/hw/mhw_mi_hwcmd_g9_X.h @@ -29,11 +29,12 @@ #define __MHW_MI_HWCMD_G9_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_mi_g9_X { public: diff --git a/media_driver/agnostic/gen9/hw/mhw_render_hwcmd_g9_X.h b/media_driver/agnostic/gen9/hw/mhw_render_hwcmd_g9_X.h index 76ca5c5e488..7051ab660af 100644 --- a/media_driver/agnostic/gen9/hw/mhw_render_hwcmd_g9_X.h +++ b/media_driver/agnostic/gen9/hw/mhw_render_hwcmd_g9_X.h @@ -29,11 +29,12 @@ #define __MHW_RENDER_HWCMD_G9_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_render_g9_X { public: diff --git a/media_driver/agnostic/gen9/hw/mhw_sfc_hwcmd_g9_X.h b/media_driver/agnostic/gen9/hw/mhw_sfc_hwcmd_g9_X.h index 9795ebcaa52..04d7938fd1f 100644 --- a/media_driver/agnostic/gen9/hw/mhw_sfc_hwcmd_g9_X.h +++ b/media_driver/agnostic/gen9/hw/mhw_sfc_hwcmd_g9_X.h @@ -29,11 +29,12 @@ #define __MHW_SFC_HWCMD_G9_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_sfc_g9_X { public: diff --git a/media_driver/agnostic/gen9/hw/mhw_state_heap_hwcmd_g9_X.h b/media_driver/agnostic/gen9/hw/mhw_state_heap_hwcmd_g9_X.h index 57c731c9a25..f40f3b713f4 100644 --- a/media_driver/agnostic/gen9/hw/mhw_state_heap_hwcmd_g9_X.h +++ b/media_driver/agnostic/gen9/hw/mhw_state_heap_hwcmd_g9_X.h @@ -29,11 +29,12 @@ #define __MHW_STATE_HEAP_HWCMD_G9_X_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_state_heap_g9_X { public: diff --git a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_bxt.h b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_bxt.h index da1a9fa9e3d..35010dd1199 100644 --- a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_bxt.h +++ b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_bxt.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HCP_HWCMD_G9_BXT_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_g9_bxt { public: diff --git a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_bxt.h b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_bxt.h index 1805e6095d7..bf89da753ef 100644 --- a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_bxt.h +++ b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_bxt.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HUC_HWCMD_G9_BXT_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_huc_g9_bxt { public: diff --git a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_bxt.h b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_bxt.h index 29df8d29942..94e9d832d6d 100644 --- a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_bxt.h +++ b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_bxt.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_MFX_HWCMD_G9_BXT_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_g9_bxt { public: diff --git a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_bxt.h b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_bxt.h index 20b4600ad57..cea84b5b7dd 100644 --- a/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_bxt.h +++ b/media_driver/agnostic/gen9_bxt/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_bxt.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_VDENC_HWCMD_G9_BXT_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_vdenc_g9_bxt { public: diff --git a/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_glk.h b/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_glk.h index 88fa2fd5902..15666b5789f 100644 --- a/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_glk.h +++ b/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_glk.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HCP_HWCMD_G9_GLK_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_g9_glk { public: diff --git a/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_glk.h b/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_glk.h index f8fc1354f5e..0fe60c2ca10 100644 --- a/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_glk.h +++ b/media_driver/agnostic/gen9_glk/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_glk.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HUC_HWCMD_G9_GLK_H__ #pragma once -#pragma pack(1) #include #include +#pragma pack(1) + class mhw_vdbox_huc_g9_glk { public: @@ -930,4 +931,4 @@ class mhw_vdbox_huc_g9_glk #pragma pack() -#endif // __MHW_VDBOX_HUC_HWCMD_G9_GLK_H__ \ No newline at end of file +#endif // __MHW_VDBOX_HUC_HWCMD_G9_GLK_H__ diff --git a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_kbl.h b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_kbl.h index 4f2d9a5a614..b72f70aeb7c 100644 --- a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_kbl.h +++ b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_kbl.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HCP_HWCMD_G9_KBL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_g9_kbl { public: diff --git a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_kbl.h b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_kbl.h index 73efa888a32..d1dbec02835 100644 --- a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_kbl.h +++ b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_kbl.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HUC_HWCMD_G9_KBL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_huc_g9_kbl { public: diff --git a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_kbl.h b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_kbl.h index cf6eeca8bf0..af72b567cb6 100644 --- a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_kbl.h +++ b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_kbl.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_MFX_HWCMD_G9_KBL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_g9_kbl { public: diff --git a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_kbl.h b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_kbl.h index d5cdff554bf..0dd108c8113 100644 --- a/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_kbl.h +++ b/media_driver/agnostic/gen9_kbl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_kbl.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_VDENC_HWCMD_G9_KBL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_vdenc_g9_kbl { public: diff --git a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_skl.h b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_skl.h index 06e4f58d6c8..062530e9c95 100644 --- a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_skl.h +++ b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_hcp_hwcmd_g9_skl.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HCP_HWCMD_G9_SKL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_hcp_g9_skl { public: diff --git a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_skl.h b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_skl.h index f7a728397da..b443c061ea7 100644 --- a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_skl.h +++ b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_huc_hwcmd_g9_skl.h @@ -32,11 +32,12 @@ #define __MHW_VDBOX_HUC_HWCMD_G9_SKL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_huc_g9_skl { public: diff --git a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_skl.h b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_skl.h index b5ae6727625..e840f38208b 100644 --- a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_skl.h +++ b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_mfx_hwcmd_g9_skl.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_MFX_HWCMD_G9_SKL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_mfx_g9_skl { public: diff --git a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_skl.h b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_skl.h index 64fc8658b07..6a13c56658c 100644 --- a/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_skl.h +++ b/media_driver/agnostic/gen9_skl/hw/vdbox/mhw_vdbox_vdenc_hwcmd_g9_skl.h @@ -29,11 +29,12 @@ #define __MHW_VDBOX_VDENC_HWCMD_G9_SKL_H__ #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + class mhw_vdbox_vdenc_g9_skl { public: diff --git a/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/hw/mhw_vebox_hwcmd_xe_hpm.h b/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/hw/mhw_vebox_hwcmd_xe_hpm.h index 1c94d0cb248..454c26b4e08 100644 --- a/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/hw/mhw_vebox_hwcmd_xe_hpm.h +++ b/media_driver/media_softlet/agnostic/Xe_M/Xe_HPM/hw/mhw_vebox_hwcmd_xe_hpm.h @@ -31,13 +31,14 @@ #define __MHW_VEBOX_HWCMD_XE_HPM_H__ #pragma once -#pragma pack(1) - #include #include #include "mhw_hwcmd.h" #include "media_class_trace.h" + +#pragma pack(1) + #pragma once #pragma pack(1) diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_lpm.h index 59db3b26b4b..85b81d10140 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_lpm.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_lpm.h @@ -34,13 +34,14 @@ #define __MHW_VDBOX_AQM_HWCMD_XE2_LPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_aqm_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_lpm.h index e870f37ad0f..6ea28364048 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_lpm.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_lpm.h @@ -35,13 +35,14 @@ #define __MHW_VDBOX_AVP_HWCMD_XE2_LPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_avp_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_lpm.h index eaf243d64f7..fa636d7a447 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_lpm.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_lpm.h @@ -36,13 +36,14 @@ #include "mhw_hwcmd.h" #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_lpm.h index 45b87728f2d..5c019e3a23d 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_lpm.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_lpm.h @@ -32,13 +32,14 @@ #define __MHW_VDBOX_HUC_HWCMD_XE2_LPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_lpm.h index c8ddb365654..c3e375b916c 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_lpm.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_lpm.h @@ -35,13 +35,14 @@ #define __MHW_VDBOX_MFX_HWCMD_XE2_LPM_H__ #pragma once -#pragma pack(1) #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe2_lpm_X.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe2_lpm_X.h index 5477e329215..59d5388512a 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe2_lpm_X.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe2_lpm_X.h @@ -35,13 +35,14 @@ #define __MHW_VDBOX_VVCP_HWCMD_XE2_LPM_X_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_blt_hwcmd_xe2_lpm.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_blt_hwcmd_xe2_lpm.h index ef23d6e9850..e7d7a97acb9 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_blt_hwcmd_xe2_lpm.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_blt_hwcmd_xe2_lpm.h @@ -32,12 +32,13 @@ #define __MHW_BLT_HWCMD_XE2_LPM_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace blt diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_sfc_hwcmd_xe2_lpm_base_next.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_sfc_hwcmd_xe2_lpm_base_next.h index b20536d0ef3..f5c220bf408 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_sfc_hwcmd_xe2_lpm_base_next.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_sfc_hwcmd_xe2_lpm_base_next.h @@ -34,12 +34,13 @@ #define __MHW_SFC_HWCMD_XE2_LPM_BASE_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace sfc diff --git a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_vebox_hwcmd_xe2_lpm_base_next.h b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_vebox_hwcmd_xe2_lpm_base_next.h index 05e1f0c34c6..b87699f89d9 100644 --- a/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_vebox_hwcmd_xe2_lpm_base_next.h +++ b/media_softlet/agnostic/Xe2_M_plus/Xe2_LPM_base/hw/mhw_vebox_hwcmd_xe2_lpm_base_next.h @@ -34,12 +34,13 @@ #define __MHW_VEBOX_HWCMD_XE2_LPM_BASE_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vebox diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe3_lpm.h index dbffe56e2f4..329c25caa56 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe3_lpm.h @@ -32,13 +32,14 @@ #define __MHW_VDBOX_AQM_HWCMD_XE3_LPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_aqm_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe3_lpm.h index 4b089cc3c58..7be7f699cd9 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe3_lpm.h @@ -32,13 +32,14 @@ #define __MHW_VDBOX_AVP_HWCMD_XE3_LPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_avp_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe3_lpm.h index 16afa5bb058..9fe274f84cd 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe3_lpm.h @@ -32,12 +32,13 @@ #define __MHW_VDBOX_HCP_HWCMD_XE3_LPM_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe3_lpm.h index 6fd40dc3cd3..05a268ce8f0 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe3_lpm.h @@ -32,12 +32,13 @@ #define __MHW_VDBOX_HUC_HWCMD_XE3_LPM_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe3_lpm.h index f667cb04e82..46ca108502e 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe3_lpm.h @@ -32,12 +32,13 @@ #define __MHW_VDBOX_MFX_HWCMD_XE3_LPM_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe3_lpm.h index 34c53ec0eb6..33feddb7d5b 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM/hw/vdbox/mhw_vdbox_vvcp_hwcmd_xe3_lpm.h @@ -32,13 +32,14 @@ #define __MHW_VDBOX_VVCP_HWCMD_XE3_LPM_X_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_blt_hwcmd_xe3_lpm.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_blt_hwcmd_xe3_lpm.h index 3bb49af6b79..607e2ab9b5b 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_blt_hwcmd_xe3_lpm.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_blt_hwcmd_xe3_lpm.h @@ -32,12 +32,13 @@ #define __MHW_BLT_HWCMD_XE3_LPM_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace blt diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_sfc_hwcmd_xe3_lpm_base.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_sfc_hwcmd_xe3_lpm_base.h index 9677b5bbeca..1cfab2fb171 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_sfc_hwcmd_xe3_lpm_base.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_sfc_hwcmd_xe3_lpm_base.h @@ -32,12 +32,13 @@ #define __MHW_SFC_HWCMD_XE3_LPM_BASE_H__ #pragma once -#pragma pack(1) #include #include #include "media_class_trace.h" +#pragma pack(1) + namespace mhw { namespace sfc diff --git a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_vebox_hwcmd_xe3_lpm_base.h b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_vebox_hwcmd_xe3_lpm_base.h index d1307c22455..84f7b9bfc36 100644 --- a/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_vebox_hwcmd_xe3_lpm_base.h +++ b/media_softlet/agnostic/Xe3_M_plus/Xe3_LPM_base/hw/mhw_vebox_hwcmd_xe3_lpm_base.h @@ -32,12 +32,13 @@ #define __MHW_VEBOX_HWCMD_XE3_LPM_BASE_H__ #pragma once -#pragma pack(1) #include #include #include "media_class_trace.h" +#pragma pack(1) + namespace mhw { namespace vebox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_blt_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_blt_hwcmd_xe2_hpm.h index 248aaf42801..77ef9035f59 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_blt_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_blt_hwcmd_xe2_hpm.h @@ -31,12 +31,13 @@ #define __MHW_BLT_HWCMD_XE2_HPM_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace blt diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_sfc_hwcmd_xe2_hpm_next.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_sfc_hwcmd_xe2_hpm_next.h index 2c41be07397..1b053746df4 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_sfc_hwcmd_xe2_hpm_next.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_sfc_hwcmd_xe2_hpm_next.h @@ -32,12 +32,13 @@ #define __MHW_SFC_HWCMD_XE2_HPM_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace sfc diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_vebox_hwcmd_xe2_hpm_next.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_vebox_hwcmd_xe2_hpm_next.h index b1935055723..75e3225d125 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_vebox_hwcmd_xe2_hpm_next.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/mhw_vebox_hwcmd_xe2_hpm_next.h @@ -30,12 +30,13 @@ #define __MHW_VEBOX_HWCMD_XE2_HPM_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vebox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_hpm.h index c9e0f14557a..13198f8fe4b 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_aqm_hwcmd_xe2_hpm.h @@ -35,13 +35,14 @@ #define __MHW_VDBOX_AQM_HWCMD_XE2_HPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_aqm_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_hpm.h index 355051a9497..ebfb0688849 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_avp_hwcmd_xe2_hpm.h @@ -33,13 +33,14 @@ #define __MHW_VDBOX_AVP_HWCMD_XE2_HPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_avp_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_hpm.h index a934be490a8..c7437f493dc 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe2_hpm.h @@ -36,11 +36,12 @@ #include "mhw_hwcmd.h" #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_hpm.h index f6bdde9ea96..706cdced648 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_huc_hwcmd_xe2_hpm.h @@ -34,13 +34,14 @@ #define __MHW_VDBOX_HUC_HWCMD_XE2_HPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_hpm.h index 1e73ee27bf9..0f6bedd58ea 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe2_hpm.h @@ -32,13 +32,14 @@ #define __MHW_VDBOX_MFX_HWCMD_XE2_HPM_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe2_hpm.h b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe2_hpm.h index 9f29aa8b9f5..a1f32679381 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe2_hpm.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe2_HPM/hw/vdbox/mhw_vdbox_vdenc_hwcmd_xe2_hpm.h @@ -33,9 +33,10 @@ #define __MHW_VDBOX_VDENC_HWCMD_XE2_HPM_H__ #pragma once +#include "mhw_hwcmd.h" + #pragma pack(1) -#include "mhw_hwcmd.h" #ifdef _MEDIA_RESERVED #include "mhw_vdbox_vdenc_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_blt_hwcmd_xe_lpm_plus_next.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_blt_hwcmd_xe_lpm_plus_next.h index bcdcaedb33e..dff63b1fed3 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_blt_hwcmd_xe_lpm_plus_next.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_blt_hwcmd_xe_lpm_plus_next.h @@ -32,12 +32,13 @@ #define __MHW_BLT_HWCMD_XE_LPM_PLUS_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace blt diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_vebox_hwcmd_xe_lpm_plus_next.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_vebox_hwcmd_xe_lpm_plus_next.h index baadae89396..f5706e33e8d 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_vebox_hwcmd_xe_lpm_plus_next.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/mhw_vebox_hwcmd_xe_lpm_plus_next.h @@ -32,12 +32,13 @@ #define __MHW_VEBOX_HWCMD_XE_LPM_PLUS_NEXT_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vebox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_lpm_plus.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_lpm_plus.h index a2ec28aa63e..c8801aa1243 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_lpm_plus.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_avp_hwcmd_xe_lpm_plus.h @@ -34,13 +34,14 @@ #define __MHW_VDBOX_AVP_HWCMD_XE_LPM_PLUS_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + #ifdef _MEDIA_RESERVED #include "mhw_vdbox_avp_hwcmd_ext.h" #endif diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_lpm_plus.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_lpm_plus.h index 1ac63970aff..e2eab0e7aa9 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_lpm_plus.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_hcp_hwcmd_xe_lpm_plus.h @@ -36,11 +36,12 @@ #include "mhw_hwcmd.h" #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_lpm_plus.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_lpm_plus.h index 93d73ee001f..94d1d27e654 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_lpm_plus.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_huc_hwcmd_xe_lpm_plus.h @@ -34,13 +34,14 @@ #define __MHW_VDBOX_HUC_HWCMD_XE_LPM_PLUS_H__ #pragma once -#pragma pack(1) - #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" + +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_lpm_plus.h b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_lpm_plus.h index 10f256c0736..8f33b96f3b8 100644 --- a/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_lpm_plus.h +++ b/media_softlet/agnostic/Xe_M_plus/Xe_LPM_plus/hw/vdbox/mhw_vdbox_mfx_hwcmd_xe_lpm_plus.h @@ -34,13 +34,14 @@ #define __MHW_VDBOX_MFX_HWCMD_XE_LPM_PLUS_H__ #pragma once -#pragma pack(1) #include "mhw_hwcmd.h" #include #include #include "media_class_trace.h" +#pragma pack(1) + namespace mhw { namespace vdbox diff --git a/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_render_hwcmd_xe2_hpg_next.h b/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_render_hwcmd_xe2_hpg_next.h index 2c6b1db3083..b6b618815f5 100644 --- a/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_render_hwcmd_xe2_hpg_next.h +++ b/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_render_hwcmd_xe2_hpg_next.h @@ -36,11 +36,12 @@ #include "mhw_hwcmd.h" #pragma once -#pragma pack(1) - #include #include + +#pragma pack(1) + namespace mhw { namespace render diff --git a/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_state_heap_hwcmd_xe2_hpg.h b/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_state_heap_hwcmd_xe2_hpg.h index 19fce5f6594..14666caec9b 100644 --- a/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_state_heap_hwcmd_xe2_hpg.h +++ b/media_softlet/agnostic/Xe_R/Xe2_HPG/hw/mhw_state_heap_hwcmd_xe2_hpg.h @@ -32,12 +32,13 @@ #define __MHW_STATE_HEAP_HWCMD_XE2_HPG_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + class mhw_state_heap_xe2_hpg { public: diff --git a/media_softlet/agnostic/Xe_R/Xe_HPG_Base/hw/mhw_state_heap_hwcmd_xe_hpg.h b/media_softlet/agnostic/Xe_R/Xe_HPG_Base/hw/mhw_state_heap_hwcmd_xe_hpg.h index 71d6057e70b..eb005eb501b 100644 --- a/media_softlet/agnostic/Xe_R/Xe_HPG_Base/hw/mhw_state_heap_hwcmd_xe_hpg.h +++ b/media_softlet/agnostic/Xe_R/Xe_HPG_Base/hw/mhw_state_heap_hwcmd_xe_hpg.h @@ -35,12 +35,13 @@ #define __MHW_STATE_HEAP_HWCMD_XE_HPG_H__ #pragma once -#pragma pack(1) - #include #include #include "media_class_trace.h" + +#pragma pack(1) + class mhw_state_heap_xe_hpg { public: