thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-12-19 06:22:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove waitIdle and only accept valid pointers on execute.

Browse source
This commit is contained in:
Dario 2025-03-13 19:11:02 -03:00
parent 9b7625f03e
commit cb4eaae9ff
5 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
UnleashedRecomp/gpu/rhi/plume_d3d12.cpp
View file

@ -2285,6 +2285,9 @@ namespace plume {
} }
void D3D12CommandQueue::executeCommandLists(const RenderCommandList **commandLists, uint32_t commandListCount, RenderCommandSemaphore **waitSemaphores, uint32_t waitSemaphoreCount, RenderCommandSemaphore **signalSemaphores, uint32_t signalSemaphoreCount, RenderCommandFence *signalFence) { void D3D12CommandQueue::executeCommandLists(const RenderCommandList **commandLists, uint32_t commandListCount, RenderCommandSemaphore **waitSemaphores, uint32_t waitSemaphoreCount, RenderCommandSemaphore **signalSemaphores, uint32_t signalSemaphoreCount, RenderCommandFence *signalFence) {
assert(commandLists != nullptr);
assert(commandListCount > 0);
for (uint32_t i = 0; i < waitSemaphoreCount; i++) { for (uint32_t i = 0; i < waitSemaphoreCount; i++) {
D3D12CommandSemaphore *interfaceSemaphore = static_cast<D3D12CommandSemaphore *>(waitSemaphores[i]); D3D12CommandSemaphore *interfaceSemaphore = static_cast<D3D12CommandSemaphore *>(waitSemaphores[i]);
d3d->Wait(interfaceSemaphore->d3d, interfaceSemaphore->semaphoreValue); d3d->Wait(interfaceSemaphore->d3d, interfaceSemaphore->semaphoreValue);
@ -2297,9 +2300,7 @@ namespace plume {
executionVector.emplace_back(static_cast<ID3D12CommandList *>(interfaceCommandList->d3d)); executionVector.emplace_back(static_cast<ID3D12CommandList *>(interfaceCommandList->d3d));
} }
if (!executionVector.empty()) { d3d->ExecuteCommandLists(UINT(executionVector.size()), executionVector.data());
d3d->ExecuteCommandLists(UINT(executionVector.size()), executionVector.data());
}
for (uint32_t i = 0; i < signalSemaphoreCount; i++) { for (uint32_t i = 0; i < signalSemaphoreCount; i++) {
D3D12CommandSemaphore *interfaceSemaphore = static_cast<D3D12CommandSemaphore *>(signalSemaphores[i]); D3D12CommandSemaphore *interfaceSemaphore = static_cast<D3D12CommandSemaphore *>(signalSemaphores[i]);
@ -3798,10 +3799,6 @@ namespace plume {
return countsSupported; return countsSupported;
} }
void D3D12Device::waitIdle() const {
assert(false && "Use fences to replicate wait idle behavior on D3D12.");
}
void D3D12Device::release() { void D3D12Device::release() {
if (d3d != nullptr) { if (d3d != nullptr) {
d3d->Release(); d3d->Release();

1
UnleashedRecomp/gpu/rhi/plume_d3d12.h
View file

@ -459,7 +459,6 @@ namespace plume {
const RenderDeviceCapabilities &getCapabilities() const override; const RenderDeviceCapabilities &getCapabilities() const override;
const RenderDeviceDescription &getDescription() const override; const RenderDeviceDescription &getDescription() const override;
RenderSampleCounts getSampleCountsSupported(RenderFormat format) const override; RenderSampleCounts getSampleCountsSupported(RenderFormat format) const override;
void waitIdle() const override;
void release(); void release();
bool isValid() const; bool isValid() const;
}; };

3
UnleashedRecomp/gpu/rhi/plume_render_interface.h
View file

@ -200,7 +200,7 @@ namespace plume {
// Concrete implementation shortcuts. // Concrete implementation shortcuts.
inline void executeCommandLists(const RenderCommandList *commandList, RenderCommandFence *signalFence = nullptr) { inline void executeCommandLists(const RenderCommandList *commandList, RenderCommandFence *signalFence = nullptr) {
executeCommandLists(commandList != nullptr ? &commandList : nullptr, commandList != nullptr ? 1 : 0, nullptr, 0, nullptr, 0, signalFence); executeCommandLists(&commandList, 1, nullptr, 0, nullptr, 0, signalFence);
} }
}; };
@ -242,7 +242,6 @@ namespace plume {
virtual const RenderDeviceCapabilities &getCapabilities() const = 0; virtual const RenderDeviceCapabilities &getCapabilities() const = 0;
virtual const RenderDeviceDescription &getDescription() const = 0; virtual const RenderDeviceDescription &getDescription() const = 0;
virtual RenderSampleCounts getSampleCountsSupported(RenderFormat format) const = 0; virtual RenderSampleCounts getSampleCountsSupported(RenderFormat format) const = 0;
virtual void waitIdle() const = 0;
}; };
struct RenderInterface { struct RenderInterface {

4
UnleashedRecomp/gpu/rhi/plume_vulkan.cpp
View file

@ -4190,10 +4190,6 @@ namespace plume {
} }
} }
void VulkanDevice::waitIdle() const {
vkDeviceWaitIdle(vk);
}
void VulkanDevice::release() { void VulkanDevice::release() {
if (allocator != VK_NULL_HANDLE) { if (allocator != VK_NULL_HANDLE) {
vmaDestroyAllocator(allocator); vmaDestroyAllocator(allocator);

1
UnleashedRecomp/gpu/rhi/plume_vulkan.h
View file

@ -430,7 +430,6 @@ namespace plume {
const RenderDeviceCapabilities &getCapabilities() const override; const RenderDeviceCapabilities &getCapabilities() const override;
const RenderDeviceDescription &getDescription() const override; const RenderDeviceDescription &getDescription() const override;
RenderSampleCounts getSampleCountsSupported(RenderFormat format) const override; RenderSampleCounts getSampleCountsSupported(RenderFormat format) const override;
void waitIdle() const override;
void release(); void release();
bool isValid() const; bool isValid() const;
}; };