diff --git a/level_zero/core/source/image/image_formats.h b/level_zero/core/source/image/image_formats.h index 45372556ce..2ad154c68d 100644 --- a/level_zero/core/source/image/image_formats.h +++ b/level_zero/core/source/image/image_formats.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ namespace L0 { namespace ImageFormats { -inline constexpr uint32_t maxLayoutCount = 43u; +inline constexpr uint32_t maxLayoutCount = 46u; using FormatTypes = std::array; @@ -34,6 +34,10 @@ inline constexpr FormatTypes layout88 = {{{GMM_FORMAT_R8G8_UINT_TYPE, NEO::GFX3D {GMM_FORMAT_R8G8_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8_UNORM, 0, 2, 1, 2}, {GMM_FORMAT_R8G8_SNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8_SNORM, 0, 2, 1, 2}, {GMM_FORMAT_R8G8_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8_UINT, 0, 2, 1, 2}}}; +inline constexpr FormatTypes layout888 = {{{GMM_FORMAT_R8G8B8_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8_UINT, 0, 3, 1, 3}, + {GMM_FORMAT_R8G8B8_SINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8_SINT, 0, 3, 1, 3}, + {GMM_FORMAT_R8G8B8_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8_UNORM, 0, 3, 1, 3}, + {GMM_FORMAT_R8G8B8_SNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8_SNORM, 0, 3, 1, 3}}}; inline constexpr FormatTypes layout8888 = {{{GMM_FORMAT_R8G8B8A8_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8A8_UINT, 0, 4, 1, 4}, {GMM_FORMAT_R8G8B8A8_SINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8A8_SINT, 0, 4, 1, 4}, {GMM_FORMAT_R8G8B8A8_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R8G8B8A8_UNORM, 0, 4, 1, 4}, @@ -49,6 +53,11 @@ inline constexpr FormatTypes layout1616 = {{{GMM_FORMAT_R16G16_UINT_TYPE, NEO::G {GMM_FORMAT_R16G16_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16_UNORM, 0, 2, 2, 4}, {GMM_FORMAT_R16G16_SNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16_SNORM, 0, 2, 2, 4}, {GMM_FORMAT_R16G16_FLOAT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16_FLOAT, 0, 2, 2, 4}}}; +inline constexpr FormatTypes layout161616 = {{{GMM_FORMAT_R16G16B16_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16_UINT, 0, 3, 2, 6}, + {GMM_FORMAT_R16G16B16_SINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16_SINT, 0, 3, 2, 6}, + {GMM_FORMAT_R16G16B16_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16_UNORM, 0, 3, 2, 6}, + {GMM_FORMAT_R16G16B16_SNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16_SNORM, 0, 3, 2, 6}, + {GMM_FORMAT_R16G16B16_FLOAT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16_FLOAT, 0, 3, 2, 6}}}; inline constexpr FormatTypes layout16161616 = {{{GMM_FORMAT_R16G16B16A16_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_UINT, 0, 4, 2, 8}, {GMM_FORMAT_R16G16B16A16_SINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_SINT, 0, 4, 2, 8}, {GMM_FORMAT_R16G16B16A16_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R16G16B16A16_UNORM, 0, 4, 2, 8}, @@ -64,6 +73,11 @@ inline constexpr FormatTypes layout3232 = {{{GMM_FORMAT_R32G32_UINT_TYPE, NEO::G {GMM_FORMAT_R32G32_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32_UNORM, 0, 2, 4, 8}, {GMM_FORMAT_R32G32_SNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32_SNORM, 0, 2, 4, 8}, {GMM_FORMAT_R32G32_FLOAT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32_FLOAT, 0, 2, 4, 8}}}; +inline constexpr FormatTypes layout323232 = {{{GMM_FORMAT_R32G32B32_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32_UINT, 0, 3, 4, 12}, + {GMM_FORMAT_R32G32B32_SINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32_SINT, 0, 3, 4, 12}, + {GMM_FORMAT_R32G32B32_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32_UNORM, 0, 3, 4, 12}, + {GMM_FORMAT_R32G32B32_SNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32_SNORM, 0, 3, 4, 12}, + {GMM_FORMAT_R32G32B32_FLOAT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32_FLOAT, 0, 3, 4, 12}}}; inline constexpr FormatTypes layout32323232 = {{{GMM_FORMAT_R32G32B32A32_UINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32A32_UINT, 0, 4, 4, 16}, {GMM_FORMAT_R32G32B32A32_SINT_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32A32_SINT, 0, 4, 4, 16}, {GMM_FORMAT_R32G32B32A32_UNORM_TYPE, NEO::GFX3DSTATE_SURFACEFORMAT_R32G32B32A32_UNORM, 0, 4, 4, 16}, @@ -244,6 +258,6 @@ inline constexpr std::array formats = {layout8, lay layout111110, layout565, layout5551, layout4444, layoutY8, layoutNV12, layoutYUYV, layoutVYUY, layoutYVYU, layoutUYVY, layoutAYUV, layoutP010, layoutY410, layoutP012, layoutY16, layoutP016, layoutY216, layoutP216, layoutP8, layoutYUY2, layoutA8P8, layoutIA44, layoutAI44, layoutY416, layoutY210, layoutI420, layoutYV12, layout400P, layout422H, layout422V, - layout444P, layoutRGBP, layoutBGRP}; + layout444P, layoutRGBP, layoutBGRP, layout888, layout161616, layout323232}; } // namespace ImageFormats } // namespace L0 diff --git a/shared/source/helpers/surface_format_info.h b/shared/source/helpers/surface_format_info.h index 065740d914..dfd1fcb771 100644 --- a/shared/source/helpers/surface_format_info.h +++ b/shared/source/helpers/surface_format_info.h @@ -180,8 +180,12 @@ enum SurfaceFormat : unsigned short { GFX3DSTATE_SURFACEFORMAT_PLANAR_420_8 = 0x1A5, GFX3DSTATE_SURFACEFORMAT_PLANAR_420_16 = 0x1a6, GFX3DSTATE_SURFACEFORMAT_PACKED_422_16 = 0x1a7, - GFX3DSTATE_SURFACEFORMAT_R10G10B10A2_SINT = 0x1b6, + GFX3DSTATE_SURFACEFORMAT_R16G16B16_UINT = 0x1b0, + GFX3DSTATE_SURFACEFORMAT_R16G16B16_SINT = 0x1b1, GFX3DSTATE_SURFACEFORMAT_R10G10B10A2_SNORM = 0x1b3, + GFX3DSTATE_SURFACEFORMAT_R10G10B10A2_SINT = 0x1b6, + GFX3DSTATE_SURFACEFORMAT_R8G8B8_UINT = 0x1c8, + GFX3DSTATE_SURFACEFORMAT_R8G8B8_SINT = 0x1c9, GFX3DSTATE_SURFACEFORMAT_RAW = 0x1FF, NUM_GFX3DSTATE_SURFACEFORMATS };