xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RHI: Refactor Fence module to pure timeline semantics

Browse Source 
- Remove IsSignaled() from RHIFence interface (semantic inconsistency)
- Remove Reset() from OpenGL implementation (no D3D12 counterpart)
- OpenGL Fence now uses single GLsync + CPU counters for timeline simulation
- OpenGL Fence Initialize() now accepts uint64_t initialValue (was bool)
- Add comprehensive timeline semantics tests for all backends:
  - Signal increment/decrement scenarios
  - Multiple signals
  - Wait smaller than completed value
  - GetCompletedValue stages verification
- Update documentation to reflect actual implementation
This commit is contained in:
ssdfasd
2026-03-24 01:53:00 +08:00
parent 92d817e16e
commit 08c01dd143
10 changed files with 769 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
tests/RHI/D3D12/unit/test_fence.cpp
View File

@@ -105,6 +105,77 @@ TEST_F(D3D12TestFixture, Fence_Signal_Multiple) {
EXPECT_EQ(fence->GetCompletedValue(), value3);
CloseHandle(eventHandle);
fence->Shutdown();
delete fence;
}
TEST_F(D3D12TestFixture, Fence_Timeline_SignalIncrement) {
auto* fence = new D3D12Fence();
ASSERT_TRUE(fence->Initialize(GetDevice()->GetDevice(), 0));
fence->Signal(1);
fence->Wait(1);
EXPECT_GE(fence->GetCompletedValue(), 1u);
fence->Signal(5);
fence->Wait(5);
EXPECT_GE(fence->GetCompletedValue(), 5u);
fence->Signal(10);
fence->Wait(10);
EXPECT_GE(fence->GetCompletedValue(), 10u);
fence->Shutdown();
delete fence;
}
TEST_F(D3D12TestFixture, Fence_Timeline_SignalDecrement) {
auto* fence = new D3D12Fence();
ASSERT_TRUE(fence->Initialize(GetDevice()->GetDevice(), 0));
fence->Signal(5);
fence->Wait(5);
EXPECT_GE(fence->GetCompletedValue(), 5u);
fence->Signal(3);
fence->Wait(3);
EXPECT_GE(fence->GetCompletedValue(), 3u);
fence->Shutdown();
delete fence;
}
TEST_F(D3D12TestFixture, Fence_Timeline_MultipleSignals) {
auto* fence = new D3D12Fence();
ASSERT_TRUE(fence->Initialize(GetDevice()->GetDevice(), 0));
fence->Signal(10);
fence->Wait(10);
EXPECT_GE(fence->GetCompletedValue(), 10u);
fence->Signal(20);
fence->Wait(20);
EXPECT_GE(fence->GetCompletedValue(), 20u);
fence->Signal(30);
fence->Wait(30);
EXPECT_GE(fence->GetCompletedValue(), 30u);
fence->Shutdown();
delete fence;
}
TEST_F(D3D12TestFixture, Fence_Timeline_WaitSmallerThanCompleted) {
auto* fence = new D3D12Fence();
ASSERT_TRUE(fence->Initialize(GetDevice()->GetDevice(), 0));
fence->Signal(5);
fence->Wait(5);
fence->Wait(3);
EXPECT_GE(fence->GetCompletedValue(), 5u);
fence->Shutdown();
delete fence;
}

87
tests/RHI/OpenGL/unit/test_fence.cpp
View File

@@ -6,10 +6,9 @@ using namespace XCEngine::RHI;
TEST_F(OpenGLTestFixture, Fence_Initialize_Unsignaled) {
OpenGLFence fence;
bool result = fence.Initialize(false);
bool result = fence.Initialize(0);
ASSERT_TRUE(result);
EXPECT_EQ(fence.GetStatus(), FenceStatus::Unsignaled);
fence.Shutdown();
}
@@ -17,7 +16,7 @@ TEST_F(OpenGLTestFixture, Fence_Initialize_Unsignaled) {
TEST_F(OpenGLTestFixture, Fence_Initialize_Signaled) {
OpenGLFence fence;
bool result = fence.Initialize(true);
bool result = fence.Initialize(1);
ASSERT_TRUE(result);
@@ -26,36 +25,100 @@ TEST_F(OpenGLTestFixture, Fence_Initialize_Signaled) {
TEST_F(OpenGLTestFixture, Fence_Signal_Wait) {
OpenGLFence fence;
fence.Initialize(false);
fence.Initialize(0);
fence.Signal(1);
fence.Wait(1);
EXPECT_TRUE(fence.IsSignaled());
EXPECT_EQ(fence.GetCompletedValue(), 1u);
fence.Shutdown();
}
TEST_F(OpenGLTestFixture, Fence_IsSignaled_ReturnsState) {
TEST_F(OpenGLTestFixture, Fence_Timeline_SignalIncrement) {
OpenGLFence fence;
fence.Initialize(false);
fence.Initialize(0);
fence.Signal(1);
fence.Wait(1);
EXPECT_EQ(fence.GetCompletedValue(), 1u);
EXPECT_TRUE(fence.IsSignaled());
fence.Signal(5);
fence.Wait(5);
EXPECT_EQ(fence.GetCompletedValue(), 5u);
fence.Signal(10);
fence.Wait(10);
EXPECT_EQ(fence.GetCompletedValue(), 10u);
fence.Shutdown();
}
TEST_F(OpenGLTestFixture, Fence_GetStatus_ReturnsCorrect) {
TEST_F(OpenGLTestFixture, Fence_Timeline_SignalDecrement) {
OpenGLFence fence;
fence.Initialize(false);
fence.Initialize(0);
FenceStatus status = fence.GetStatus();
EXPECT_TRUE(status == FenceStatus::Signaled || status == FenceStatus::Unsignaled);
fence.Signal(5);
fence.Wait(5);
EXPECT_EQ(fence.GetCompletedValue(), 5u);
fence.Signal(3);
fence.Wait(3);
EXPECT_EQ(fence.GetCompletedValue(), 3u);
fence.Shutdown();
}
TEST_F(OpenGLTestFixture, Fence_Timeline_MultipleSignals) {
OpenGLFence fence;
fence.Initialize(0);
fence.Signal(10);
fence.Wait(10);
fence.Signal(20);
fence.Wait(20);
fence.Signal(30);
fence.Wait(30);
EXPECT_EQ(fence.GetCompletedValue(), 30u);
fence.Shutdown();
}
TEST_F(OpenGLTestFixture, Fence_Timeline_WaitSmallerThanCompleted) {
OpenGLFence fence;
fence.Initialize(0);
fence.Signal(5);
fence.Wait(5);
fence.Wait(3);
EXPECT_GE(fence.GetCompletedValue(), 5u);
fence.Shutdown();
}
TEST_F(OpenGLTestFixture, Fence_Timeline_GetCompletedValue_Stages) {
OpenGLFence fence;
fence.Initialize(0);
EXPECT_EQ(fence.GetCompletedValue(), 0u);
fence.Signal(1);
fence.Wait(1);
EXPECT_EQ(fence.GetCompletedValue(), 1u);
fence.Signal(10);
fence.Wait(10);
EXPECT_EQ(fence.GetCompletedValue(), 10u);
fence.Signal(5);
fence.Wait(5);
EXPECT_EQ(fence.GetCompletedValue(), 5u);
fence.Shutdown();
}

99
tests/RHI/unit/test_fence.cpp
View File

@@ -64,27 +64,13 @@ TEST_P(RHITestFixture, Fence_GetCompletedValue) {
EXPECT_EQ(fence->GetCompletedValue(), 0u);
fence->Signal(1);
fence->Wait(1);
EXPECT_EQ(fence->GetCompletedValue(), 1u);
fence->Shutdown();
delete fence;
}
TEST_P(RHITestFixture, Fence_IsSignaled) {
FenceDesc desc = {};
desc.initialValue = 0;
RHIFence* fence = GetDevice()->CreateFence(desc);
ASSERT_NE(fence, nullptr);
EXPECT_FALSE(fence->IsSignaled());
fence->Signal(1);
EXPECT_TRUE(fence->IsSignaled());
fence->Shutdown();
delete fence;
}
TEST_P(RHITestFixture, Fence_GetNativeHandle) {
FenceDesc desc = {};
desc.initialValue = 0;
@@ -97,3 +83,86 @@ TEST_P(RHITestFixture, Fence_GetNativeHandle) {
fence->Shutdown();
delete fence;
}
TEST_P(RHITestFixture, Fence_Timeline_SignalIncrement) {
FenceDesc desc = {};
desc.initialValue = 0;
RHIFence* fence = GetDevice()->CreateFence(desc);
ASSERT_NE(fence, nullptr);
fence->Signal(1);
fence->Wait(1);
EXPECT_GE(fence->GetCompletedValue(), 1u);
fence->Signal(5);
fence->Wait(5);
EXPECT_GE(fence->GetCompletedValue(), 5u);
fence->Signal(10);
fence->Wait(10);
EXPECT_GE(fence->GetCompletedValue(), 10u);
fence->Shutdown();
delete fence;
}
TEST_P(RHITestFixture, Fence_Timeline_SignalDecrement) {
FenceDesc desc = {};
desc.initialValue = 0;
RHIFence* fence = GetDevice()->CreateFence(desc);
ASSERT_NE(fence, nullptr);
fence->Signal(5);
fence->Wait(5);
EXPECT_GE(fence->GetCompletedValue(), 5u);
fence->Signal(3);
fence->Wait(3);
EXPECT_GE(fence->GetCompletedValue(), 3u);
fence->Shutdown();
delete fence;
}
TEST_P(RHITestFixture, Fence_Timeline_MultipleSignals) {
FenceDesc desc = {};
desc.initialValue = 0;
RHIFence* fence = GetDevice()->CreateFence(desc);
ASSERT_NE(fence, nullptr);
fence->Signal(10);
fence->Wait(10);
EXPECT_GE(fence->GetCompletedValue(), 10u);
fence->Signal(20);
fence->Wait(20);
EXPECT_GE(fence->GetCompletedValue(), 20u);
fence->Signal(30);
fence->Wait(30);
EXPECT_GE(fence->GetCompletedValue(), 30u);
fence->Shutdown();
delete fence;
}
TEST_P(RHITestFixture, Fence_Timeline_WaitSmallerThanCompleted) {
FenceDesc desc = {};
desc.initialValue = 0;
RHIFence* fence = GetDevice()->CreateFence(desc);
ASSERT_NE(fence, nullptr);
fence->Signal(5);
fence->Wait(5);
fence->Wait(3);
EXPECT_GE(fence->GetCompletedValue(), 5u);
fence->Shutdown();
delete fence;
}