From 8fe266e02731811292d40766d8840030e67c2dd8 Mon Sep 17 00:00:00 2001 From: BZLZHH Date: Thu, 5 Feb 2026 14:00:23 +0800 Subject: [PATCH] [Fix] (MG_Test/BufferObject): Migrate to the new API for dirty ranges. --- MobileGL/MG_Test/Buffer/BufferTest.cpp | 27 +++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/MobileGL/MG_Test/Buffer/BufferTest.cpp b/MobileGL/MG_Test/Buffer/BufferTest.cpp index 0f113a91..681c3652 100644 --- a/MobileGL/MG_Test/Buffer/BufferTest.cpp +++ b/MobileGL/MG_Test/Buffer/BufferTest.cpp @@ -72,7 +72,8 @@ TEST_F(BufferTest, PingPong) { Vector bufdata(data.size()); memcpy(bufdata.data(), p, byteSize); ASSERT_EQ(data, bufdata); - auto range = bufRead->GetDirtyRange(); + ASSERT_EQ(bufRead->GetDirtyRanges().size() >= 1, true); + auto range = bufRead->GetDirtyRanges()[0]; ASSERT_EQ(range.start, 0); ASSERT_EQ(range.end, byteSize); } @@ -122,7 +123,8 @@ TEST_F(BufferTest, AcquireMemory) { void* p = bufObj->AcquireMemory(false, true, false); memcpy(actual.data(), p, byteSize); ASSERT_EQ(actual, expected); - auto dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + auto dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, 0); ASSERT_EQ(dirty.end, sizeof(Int) * 5); @@ -150,7 +152,8 @@ TEST_F(BufferTest, AcquireMemoryRangeWithoutExplicit) { void* p = bufObj->AcquireMemory(false, true, false); memcpy(actual.data(), p, byteSize); ASSERT_EQ(actual, expected); - auto dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + auto dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, sizeof(Int)); ASSERT_EQ(dirty.end, sizeof(Int) * 4); } @@ -177,13 +180,15 @@ TEST_F(BufferTest, AcquireMemoryRangeWithExplicit) { mappedPtr[1] = 300; bufObj->FlushMemoryRange(0, sizeof(Int)); - auto dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + auto dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, sizeof(Int)); ASSERT_EQ(dirty.end, sizeof(Int) * 2); bufObj->ReleaseMemory(); - dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, sizeof(Int)); ASSERT_EQ(dirty.end, sizeof(Int) * 2); @@ -193,7 +198,8 @@ TEST_F(BufferTest, AcquireMemoryRangeWithExplicit) { memcpy(actual.data(), p, byteSize); ASSERT_EQ(actual, expected); - dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, sizeof(Int)); ASSERT_EQ(dirty.end, sizeof(Int) * 2); } @@ -235,7 +241,8 @@ TEST_F(BufferTest, CopyBufferSubData) { ASSERT_EQ(actual, expected); - auto dirty = dstObj->GetDirtyRange(); + ASSERT_EQ(dstObj->GetDirtyRanges().size() >= 1, true); + auto dirty = dstObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, 5 * sizeof(Int)); ASSERT_EQ(dirty.end, 9 * sizeof(Int)); } @@ -265,7 +272,8 @@ TEST_F(BufferTest, WriteWhileMapped) { ASSERT_EQ(actual, expected); - auto dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + auto dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, 0); ASSERT_EQ(dirty.end, byteSize); } @@ -293,7 +301,8 @@ TEST_F(BufferTest, PartialUpdate) { ASSERT_EQ(actual, expected); - auto dirty = bufObj->GetDirtyRange(); + ASSERT_EQ(bufObj->GetDirtyRanges().size() >= 1, true); + auto dirty = bufObj->GetDirtyRanges()[0]; ASSERT_EQ(dirty.start, sizeof(Int)); ASSERT_EQ(dirty.end, 3 * sizeof(Int)); }