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

RHI: Fix view type signatures in CommandList abstraction

Browse Source 
- Unified RHICommandList interface to use RHIResourceView* for all view types
- Fixed OpenGLCommandList override signatures (SetVertexBuffers, SetIndexBuffer, etc.)
- Fixed D3D12CommandList by removing duplicate SetVertexBuffer methods
- Updated OpenGLCommandList.cpp to match new signatures
- Build and all 845 tests pass
This commit is contained in:
ssdfasd
2026-03-24 23:41:57 +08:00
parent 7a66913f2b
commit 1e88beacb8
10 changed files with 505 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
engine/include/XCEngine/RHI/D3D12/D3D12CommandList.h
View File

@@ -70,9 +70,6 @@ public:
void SetRenderTargetsInternal(uint32_t count, ID3D12Resource** renderTargets, ID3D12Resource* depthStencil = nullptr);
void SetRenderTargetsHandle(uint32_t count, const D3D12_CPU_DESCRIPTOR_HANDLE* renderTargetHandles, const D3D12_CPU_DESCRIPTOR_HANDLE* depthStencilHandle = nullptr);
void SetVertexBuffer(uint32_t slot, RHIResourceView* buffer, uint64_t offset) override;
void SetVertexBuffer(uint32_t slot, ID3D12Resource* buffer, uint64_t offset, uint32_t stride);
void SetVertexBufferInternal(uint32_t slot, ID3D12Resource* buffer, uint64_t offset, uint32_t stride);
void SetVertexBuffers(uint32_t startSlot, uint32_t count, RHIResourceView** buffers, const uint64_t* offsets, const uint32_t* strides) override;
void SetVertexBuffersInternal(uint32_t startSlot, uint32_t count, const D3D12_VERTEX_BUFFER_VIEW* views);
void SetIndexBuffer(RHIResourceView* buffer, uint64_t offset) override;

1
engine/include/XCEngine/RHI/OpenGL/OpenGLCommandList.h
View File

@@ -68,7 +68,6 @@ public:
void SetGlobalTexture(const char* name, RHIResourceView* texture) override;
void SetPipelineState(RHIPipelineState* pipelineState) override;
void SetVertexBuffer(uint32_t slot, RHIResourceView* buffer, uint64_t offset) override;
void SetVertexBuffers(uint32_t startSlot, uint32_t count, RHIResourceView** buffers, const uint64_t* offsets, const uint32_t* strides) override;
void SetIndexBuffer(RHIResourceView* buffer, uint64_t offset) override;

3
engine/include/XCEngine/RHI/RHIBuffer.h
View File

@@ -2,12 +2,13 @@
#include "RHITypes.h"
#include "RHIEnums.h"
#include "RHIResource.h"
#include <string>
namespace XCEngine {
namespace RHI {
class RHIBuffer {
class RHIBuffer : public RHIResource {
public:
virtual ~RHIBuffer() = default;

6
engine/include/XCEngine/RHI/RHICommandList.h
View File

@@ -2,11 +2,12 @@
#include "RHITypes.h"
#include "RHIEnums.h"
#include "RHIResource.h"
#include "RHIResourceView.h"
namespace XCEngine {
namespace RHI {
class RHIResourceView;
class RHIPipelineState;
class RHIShader;
@@ -83,7 +84,6 @@ public:
virtual void SetBlendState(const BlendState& state) = 0;
virtual void SetBlendFactor(const float factor[4]) = 0;
virtual void SetVertexBuffer(uint32_t slot, RHIResourceView* buffer, uint64_t offset) = 0;
virtual void SetVertexBuffers(uint32_t startSlot, uint32_t count, RHIResourceView** buffers, const uint64_t* offsets, const uint32_t* strides) = 0;
virtual void SetIndexBuffer(RHIResourceView* buffer, uint64_t offset) = 0;
@@ -102,4 +102,4 @@ public:
};
} // namespace RHI
} // namespace XCEngine
} // namespace XCEngine

19
engine/include/XCEngine/RHI/RHIResource.h Normal file
View File

@@ -0,0 +1,19 @@
#pragma once
#include "RHITypes.h"
#include "RHIEnums.h"
namespace XCEngine {
namespace RHI {
class RHIResource {
public:
virtual ~RHIResource() = default;
virtual void* GetNativeHandle() = 0;
virtual ResourceStates GetState() const = 0;
virtual void SetState(ResourceStates state) = 0;
};
} // namespace RHI
} // namespace XCEngine

48
engine/include/XCEngine/RHI/RHIResourceView.h
View File

@@ -21,5 +21,51 @@ public:
virtual Format GetFormat() const = 0;
};
class RHIVertexBufferView : public RHIResourceView {
public:
virtual ~RHIVertexBufferView() = default;
virtual uint64_t GetBufferAddress() const = 0;
virtual uint32_t GetSize() const = 0;
virtual uint32_t GetStride() const = 0;
};
class RHIIndexBufferView : public RHIResourceView {
public:
virtual ~RHIIndexBufferView() = default;
virtual uint64_t GetBufferAddress() const = 0;
virtual uint32_t GetSize() const = 0;
virtual Format GetIndexFormat() const = 0;
};
class RHIRenderTargetView : public RHIResourceView {
public:
virtual ~RHIRenderTargetView() = default;
};
class RHIDepthStencilView : public RHIResourceView {
public:
virtual ~RHIDepthStencilView() = default;
};
class RHIShaderResourceView : public RHIResourceView {
public:
virtual ~RHIShaderResourceView() = default;
};
class RHIUnorderedAccessView : public RHIResourceView {
public:
virtual ~RHIUnorderedAccessView() = default;
};
class RHIConstantBufferView : public RHIResourceView {
public:
virtual ~RHIConstantBufferView() = default;
virtual uint64_t GetBufferAddress() const = 0;
virtual uint32_t GetSize() const = 0;
};
} // namespace RHI
} // namespace XCEngine
} // namespace XCEngine

3
engine/include/XCEngine/RHI/RHITexture.h
View File

@@ -2,12 +2,13 @@
#include "RHITypes.h"
#include "RHIEnums.h"
#include "RHIResource.h"
#include <string>
namespace XCEngine {
namespace RHI {
class RHITexture {
class RHITexture : public RHIResource {
public:
virtual ~RHITexture() = default;

23
engine/src/RHI/D3D12/D3D12CommandList.cpp
View File

@@ -369,29 +369,6 @@ void D3D12CommandList::SetRenderTargetsHandle(uint32_t count, const D3D12_CPU_DE
}
}
void D3D12CommandList::SetVertexBuffer(uint32_t slot, RHIResourceView* buffer, uint64_t offset) {
if (!buffer || !buffer->IsValid()) return;
D3D12ResourceView* view = static_cast<D3D12ResourceView*>(buffer);
D3D12_VERTEX_BUFFER_VIEW vbView = {};
vbView.BufferLocation = view->GetResource()->GetGPUVirtualAddress() + offset;
vbView.SizeInBytes = static_cast<UINT>(view->GetResource()->GetDesc().Width) - static_cast<UINT>(offset);
vbView.StrideInBytes = 0;
m_commandList->IASetVertexBuffers(slot, 1, &vbView);
}
void D3D12CommandList::SetVertexBuffer(uint32_t slot, ID3D12Resource* buffer, uint64_t offset, uint32_t stride) {
SetVertexBufferInternal(slot, buffer, offset, stride);
}
void D3D12CommandList::SetVertexBufferInternal(uint32_t slot, ID3D12Resource* buffer, uint64_t offset, uint32_t stride) {
D3D12_VERTEX_BUFFER_VIEW view = {};
view.BufferLocation = buffer->GetGPUVirtualAddress() + offset;
view.SizeInBytes = static_cast<UINT>(buffer->GetDesc().Width) - static_cast<UINT>(offset);
view.StrideInBytes = stride;
m_commandList->IASetVertexBuffers(slot, 1, &view);
}
void D3D12CommandList::SetVertexBuffers(uint32_t startSlot, uint32_t count, RHIResourceView** buffers, const uint64_t* offsets, const uint32_t* strides) {
std::vector<D3D12_VERTEX_BUFFER_VIEW> views(count);
for (uint32_t i = 0; i < count; ++i) {

11
engine/src/RHI/OpenGL/OpenGLCommandList.cpp
View File

@@ -609,17 +609,6 @@ void OpenGLCommandList::SetPipelineState(RHIPipelineState* pipelineState) {
}
}
void OpenGLCommandList::SetVertexBuffer(uint32_t slot, RHIResourceView* buffer, uint64_t offset) {
if (!buffer) return;
OpenGLResourceView* view = static_cast<OpenGLResourceView*>(buffer);
if (!view->IsValid()) return;
GLuint glBuffer = view->GetBuffer();
glBindBuffer(GL_ARRAY_BUFFER, glBuffer);
glVertexAttribPointer(slot, 4, GL_FLOAT, GL_FALSE, 0, reinterpret_cast<void*>(static_cast<uintptr_t>(offset)));
glEnableVertexAttribArray(slot);
}
void OpenGLCommandList::SetVertexBuffers(uint32_t startSlot, uint32_t count, RHIResourceView** buffers, const uint64_t* offsets, const uint32_t* strides) {
for (uint32_t i = 0; i < count; i++) {
if (!buffers[i]) continue;