Skip to content

Commit e43e061

Browse files
Do not require RenderCompressed or MediaCompressed flags for compression
Change-Id: I19782bf16b94c34a0af6de62203e2a1b5c25a359 Related-To: NEO-3771
1 parent b78c9ec commit e43e061

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

runtime/gmm_helper/gmm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ uint8_t Gmm::resourceCopyBlt(void *sys, void *gpu, uint32_t pitch, uint32_t heig
241241
bool Gmm::unifiedAuxTranslationCapable() const {
242242
auto gmmFlags = this->gmmResourceInfo->getResourceFlags();
243243
UNRECOVERABLE_IF(gmmFlags->Info.RenderCompressed && gmmFlags->Info.MediaCompressed);
244-
return gmmFlags->Gpu.CCS && gmmFlags->Gpu.UnifiedAuxSurface && (gmmFlags->Info.RenderCompressed | gmmFlags->Info.MediaCompressed);
244+
return gmmFlags->Gpu.CCS && gmmFlags->Gpu.UnifiedAuxSurface;
245245
}
246246

247247
bool Gmm::hasMultisampleControlSurface() const {

unit_tests/gmm_helper/gmm_helper_tests.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,11 @@ TEST_F(GmmMediaCompressedTests, givenMediaAndRenderCompressedGmmUnifiedAuxTransl
419419
EXPECT_THROW(gmm->unifiedAuxTranslationCapable(), std::exception);
420420
}
421421

422-
TEST_F(GmmMediaCompressedTests, givenNotMediaAndNotRenderCompressedGmmUnifiedAuxTranslationCapableReturnsFalse) {
422+
TEST_F(GmmMediaCompressedTests, givenNotMediaAndNotRenderCompressedGmmUnifiedAuxTranslationCapableReturnsTrue) {
423423
flags->Info.MediaCompressed = false;
424424
flags->Info.RenderCompressed = false;
425425

426-
EXPECT_FALSE(gmm->unifiedAuxTranslationCapable());
426+
EXPECT_TRUE(gmm->unifiedAuxTranslationCapable());
427427
}
428428

429429
namespace GmmTestConst {
@@ -607,7 +607,8 @@ TEST(GmmTest, givenAllValidFlagsWhenAskedForUnifiedAuxTranslationCapabilityThenR
607607
mockResource->setUnifiedAuxTranslationCapable();
608608
EXPECT_EQ(1u, mockResource->mockResourceCreateParams.Flags.Gpu.CCS);
609609
EXPECT_EQ(1u, mockResource->mockResourceCreateParams.Flags.Gpu.UnifiedAuxSurface);
610-
EXPECT_EQ(1u, mockResource->mockResourceCreateParams.Flags.Info.RenderCompressed);
610+
EXPECT_EQ(0u, mockResource->mockResourceCreateParams.Flags.Info.RenderCompressed);
611+
EXPECT_EQ(0u, mockResource->mockResourceCreateParams.Flags.Info.MediaCompressed);
611612

612613
EXPECT_TRUE(gmm->unifiedAuxTranslationCapable());
613614
}
@@ -624,10 +625,6 @@ TEST(GmmTest, givenInvalidFlagsSetWhenAskedForUnifiedAuxTranslationCapabilityThe
624625
mockResource->mockResourceCreateParams.Flags.Gpu.CCS = 1;
625626
mockResource->mockResourceCreateParams.Flags.Gpu.UnifiedAuxSurface = 0;
626627
EXPECT_FALSE(gmm->unifiedAuxTranslationCapable()); // UnifiedAuxSurface == 0
627-
628-
mockResource->mockResourceCreateParams.Flags.Gpu.UnifiedAuxSurface = 1;
629-
mockResource->mockResourceCreateParams.Flags.Info.RenderCompressed = 0;
630-
EXPECT_FALSE(gmm->unifiedAuxTranslationCapable()); // RenderCompressed == 0
631628
}
632629

633630
TEST(GmmTest, givenHwInfoWhenDeviceIsCreatedTheSetThisHwInfoToGmmHelper) {

unit_tests/mocks/mock_gmm_resource_info.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ uint32_t MockGmmResourceInfo::getBitsPerPixel() {
120120
void MockGmmResourceInfo::setUnifiedAuxTranslationCapable() {
121121
mockResourceCreateParams.Flags.Gpu.CCS = 1;
122122
mockResourceCreateParams.Flags.Gpu.UnifiedAuxSurface = 1;
123-
mockResourceCreateParams.Flags.Info.RenderCompressed = 1;
124123
}
125124

126125
void MockGmmResourceInfo::setMultisampleControlSurface() {

0 commit comments

Comments
 (0)