RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-02-19 22:25:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[amdgpu] Disabled tiling and do image blit on flip

Browse source 
Cleanup
This commit is contained in:
DH 2023-06-25 22:58:15 +03:00
parent 08fd89ad66
commit 47b0d53983
3 changed files with 295 additions and 558 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
hw/amdgpu/device/include/amdgpu/device/device.hpp
View file

@ -1304,12 +1304,7 @@ public:
iterator() = default;
iterator(map_iterator it) : it(it) {}
ZoneInfo operator *() const {
return {
it->first,
std::next(it)->first
};
}
ZoneInfo operator*() const { return {it->first, std::next(it)->first}; }
iterator &operator++() const {
++it;
@ -1323,21 +1318,13 @@ public:
return *this;
}
bool operator==(iterator other) const {
return it == other.it;
}
bool operator==(iterator other) const { return it == other.it; }
bool operator!=(iterator other) const {
return it != other.it;
}
bool operator!=(iterator other) const { return it != other.it; }
};
iterator begin() {
return iterator(mAreas.begin());
}
iterator end() {
return iterator(mAreas.end());
}
iterator begin() { return iterator(mAreas.begin()); }
iterator end() { return iterator(mAreas.end()); }
void clear() { mAreas.clear(); }
@ -1477,7 +1464,9 @@ void dispatch(RemoteMemory memory, DrawContext &ctxt, std::size_t dimX,
std::size_t dimY, std::size_t dimZ);
void handleCommandBuffer(RemoteMemory memory, DrawContext &ctxt,
std::uint32_t *cmds, std::uint32_t count);
void setVkDevice(VkDevice device, VkPhysicalDeviceMemoryProperties memProperties, VkPhysicalDeviceProperties devProperties);
void setVkDevice(VkDevice device,
VkPhysicalDeviceMemoryProperties memProperties,
VkPhysicalDeviceProperties devProperties);
struct AmdgpuDevice {
amdgpu::device::DrawContext dc;
@ -1515,12 +1504,14 @@ struct AmdgpuDevice {
void handleProtectMemory(std::uint64_t address, std::uint64_t size,
std::uint32_t prot);
void handleCommandBuffer(std::uint64_t address, std::uint64_t size);
void handleSetBuffer(std::uint32_t bufferIndex, std::uint64_t address,
std::uint32_t width, std::uint32_t height,
std::uint32_t pitch, std::uint32_t pixelFormat,
std::uint32_t tilingMode);
bool handleFlip(std::uint32_t bufferIndex, std::uint64_t arg, VkCommandBuffer cmd, VkImage targetImage, VkExtent2D targetExtent, std::vector<VkBuffer> &usedBuffers);
AmdgpuDevice(amdgpu::device::DrawContext dc, amdgpu::bridge::BridgeHeader *bridge, RemoteMemory memory, std::uint64_t memorySize)
: dc(dc), bridge(bridge), memory(memory), memorySize(memorySize) {}
bool handleFlip(std::uint32_t bufferIndex, std::uint64_t arg,
VkCommandBuffer cmd, VkImage targetImage,
VkExtent2D targetExtent, std::vector<VkBuffer> &usedBuffers,
std::vector<VkImage> &usedImages);
AmdgpuDevice(amdgpu::device::DrawContext dc,
amdgpu::bridge::BridgeHeader *bridge, RemoteMemory memory,
std::uint64_t memorySize)
: dc(dc), bridge(bridge), memory(memory), memorySize(memorySize) {}
};
} // namespace amdgpu::device

796
hw/amdgpu/device/src/device.cpp
View file

File diff suppressed because it is too large Load diff

14
rpcsx-gpu/main.cpp
View file

@ -724,8 +724,11 @@ int main(int argc, const char *argv[]) {
uint32_t imageIndex = 0;
bool isImageAcquired = false;
std::vector<std::vector<VkBuffer>> swapchainHandles;
swapchainHandles.resize(swapchainImages.size());
std::vector<std::vector<VkBuffer>> swapchainBufferHandles;
swapchainBufferHandles.resize(swapchainImages.size());
std::vector<std::vector<VkImage>> swapchainImageHandles;
swapchainImageHandles.resize(swapchainImages.size());
VkPipelineStageFlags submitPipelineStages =
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
@ -772,16 +775,17 @@ int main(int argc, const char *argv[]) {
vkBeginCommandBuffer(presentCmdBuffers[imageIndex], &beginInfo);
for (auto handle : swapchainHandles[imageIndex]) {
for (auto handle : swapchainBufferHandles[imageIndex]) {
vkDestroyBuffer(vkDevice, handle, nullptr);
}
swapchainHandles[imageIndex].clear();
swapchainBufferHandles[imageIndex].clear();
if (device.handleFlip(cmd.flip.bufferIndex, cmd.flip.arg,
presentCmdBuffers[imageIndex],
swapchainImages[imageIndex], swapchainExtent,
swapchainHandles[imageIndex])) {
swapchainBufferHandles[imageIndex],
swapchainImageHandles[imageIndex])) {
vkEndCommandBuffer(presentCmdBuffers[imageIndex]);
VkSubmitInfo submitInfo{};