refactor: remove minGen field and pregen12 platform cases
Related-To: NEO-12681 Signed-off-by: Michał Pryba <michal.pryba@intel.com>
This commit is contained in:
parent
a857fda73a
commit
b9df406a46
|
@ -1556,21 +1556,20 @@ HWTEST2_F(ImageCreate, WhenImageIsCreatedThenDescMatchesSurfaceFormats, IsAtMost
|
||||||
ze_image_format_type_t formatType;
|
ze_image_format_type_t formatType;
|
||||||
SURFACE_FORMAT ssFormat;
|
SURFACE_FORMAT ssFormat;
|
||||||
bool requireEven;
|
bool requireEven;
|
||||||
GFXCORE_FAMILY minGen;
|
|
||||||
};
|
};
|
||||||
struct FormatInfo testFormats[] = {
|
struct FormatInfo testFormats[] = {
|
||||||
{sizeof(uint8_t) * 8, ZE_IMAGE_FORMAT_LAYOUT_8, ZE_IMAGE_FORMAT_TYPE_UINT,
|
{sizeof(uint8_t) * 8, ZE_IMAGE_FORMAT_LAYOUT_8, ZE_IMAGE_FORMAT_TYPE_UINT,
|
||||||
RENDER_SURFACE_STATE::SURFACE_FORMAT_R8_UINT, false, IGFX_GEN9_CORE},
|
RENDER_SURFACE_STATE::SURFACE_FORMAT_R8_UINT, false},
|
||||||
{sizeof(uint32_t) * 4 * 8, ZE_IMAGE_FORMAT_LAYOUT_32_32_32_32, ZE_IMAGE_FORMAT_TYPE_UINT,
|
{sizeof(uint32_t) * 4 * 8, ZE_IMAGE_FORMAT_LAYOUT_32_32_32_32, ZE_IMAGE_FORMAT_TYPE_UINT,
|
||||||
RENDER_SURFACE_STATE::SURFACE_FORMAT_R32G32B32A32_UINT, false, IGFX_GEN9_CORE},
|
RENDER_SURFACE_STATE::SURFACE_FORMAT_R32G32B32A32_UINT, false},
|
||||||
{sizeof(uint8_t) * 4 * 8, ZE_IMAGE_FORMAT_LAYOUT_8_8_8_8, ZE_IMAGE_FORMAT_TYPE_UNORM,
|
{sizeof(uint8_t) * 4 * 8, ZE_IMAGE_FORMAT_LAYOUT_8_8_8_8, ZE_IMAGE_FORMAT_TYPE_UNORM,
|
||||||
RENDER_SURFACE_STATE::SURFACE_FORMAT_R8G8B8A8_UNORM, false, IGFX_GEN9_CORE},
|
RENDER_SURFACE_STATE::SURFACE_FORMAT_R8G8B8A8_UNORM, false},
|
||||||
{sizeof(int16_t) * 8, ZE_IMAGE_FORMAT_LAYOUT_16, ZE_IMAGE_FORMAT_TYPE_SNORM,
|
{sizeof(int16_t) * 8, ZE_IMAGE_FORMAT_LAYOUT_16, ZE_IMAGE_FORMAT_TYPE_SNORM,
|
||||||
RENDER_SURFACE_STATE::SURFACE_FORMAT_R16_SNORM, false, IGFX_GEN9_CORE},
|
RENDER_SURFACE_STATE::SURFACE_FORMAT_R16_SNORM, false},
|
||||||
{sizeof(float) * 4 * 8, ZE_IMAGE_FORMAT_LAYOUT_32_32_32_32, ZE_IMAGE_FORMAT_TYPE_FLOAT,
|
{sizeof(float) * 4 * 8, ZE_IMAGE_FORMAT_LAYOUT_32_32_32_32, ZE_IMAGE_FORMAT_TYPE_FLOAT,
|
||||||
RENDER_SURFACE_STATE::SURFACE_FORMAT_R32G32B32A32_FLOAT, false, IGFX_GEN9_CORE},
|
RENDER_SURFACE_STATE::SURFACE_FORMAT_R32G32B32A32_FLOAT, false},
|
||||||
{sizeof(uint32_t) * 8, ZE_IMAGE_FORMAT_LAYOUT_10_10_10_2, ZE_IMAGE_FORMAT_TYPE_UINT,
|
{sizeof(uint32_t) * 8, ZE_IMAGE_FORMAT_LAYOUT_10_10_10_2, ZE_IMAGE_FORMAT_TYPE_UINT,
|
||||||
RENDER_SURFACE_STATE::SURFACE_FORMAT_R10G10B10A2_UINT, false, IGFX_GEN10_CORE}};
|
RENDER_SURFACE_STATE::SURFACE_FORMAT_R10G10B10A2_UINT, false}};
|
||||||
size_t numFormats = sizeof(testFormats) / sizeof(struct FormatInfo);
|
size_t numFormats = sizeof(testFormats) / sizeof(struct FormatInfo);
|
||||||
|
|
||||||
for (size_t i = 0; i < numFormats; i++) {
|
for (size_t i = 0; i < numFormats; i++) {
|
||||||
|
@ -1581,10 +1580,6 @@ HWTEST2_F(ImageCreate, WhenImageIsCreatedThenDescMatchesSurfaceFormats, IsAtMost
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gfxCoreFamily < testFormats[i].minGen) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
ze_image_desc_t *desc = odd ? &descOdd : &descEven;
|
ze_image_desc_t *desc = odd ? &descOdd : &descEven;
|
||||||
|
|
||||||
desc->format.layout = testFormats[i].formatLayout;
|
desc->format.layout = testFormats[i].formatLayout;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2021-2024 Intel Corporation
|
* Copyright (C) 2021-2025 Intel Corporation
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: MIT
|
* SPDX-License-Identifier: MIT
|
||||||
*
|
*
|
||||||
|
@ -128,18 +128,6 @@ class WslComputeHelperUmKmDataTranslator : public UmKmDataTranslator {
|
||||||
switch (prod) {
|
switch (prod) {
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
case 28:
|
|
||||||
prod = IGFX_ICELAKE;
|
|
||||||
break;
|
|
||||||
case 29:
|
|
||||||
prod = IGFX_ICELAKE_LP;
|
|
||||||
break;
|
|
||||||
case 30:
|
|
||||||
prod = IGFX_LAKEFIELD;
|
|
||||||
break;
|
|
||||||
case 31:
|
|
||||||
prod = IGFX_JASPERLAKE;
|
|
||||||
break;
|
|
||||||
case 33:
|
case 33:
|
||||||
prod = IGFX_TIGERLAKE_LP;
|
prod = IGFX_TIGERLAKE_LP;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue