RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-09 00:14:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpcsx-gpu: fix flip image acquire

Browse source 
fix cmpx
fix cs init ordering
implement s_mulk_i32, s_abs_i32, s_cmovk_i32, s_cmov_b32 and s_cmov_b64
fix s_mul_i32
fix s_cbranch_* for cs
This commit is contained in:
DH 2024-10-04 17:45:56 +03:00
parent 23226c966a
commit 113abf20e5
13 changed files with 126 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

53
rpcsx-gpu/main.cpp
View file

@ -18,8 +18,6 @@
#include <cstdio>
#include <cstdlib>
#include <filesystem>
#include <fstream>
#include <iostream>
#include <print>
#include <span>
#include <thread>
@ -39,20 +37,6 @@
#include "Device.hpp"
static void saveImage(const char *name, const void *data, std::uint32_t width,
std::uint32_t height) {
std::ofstream file(name, std::ios::out | std::ios::binary);
file << "P6\n" << width << "\n" << height << "\n" << 255 << "\n";
auto ptr = (unsigned int *)data;
for (uint32_t y = 0; y < height; y++) {
for (uint32_t x = 0; x < width; x++) {
file.write((char *)ptr++, 3);
}
}
}
void transitionImageLayout(VkCommandBuffer commandBuffer, VkImage image,
VkImageLayout oldLayout, VkImageLayout newLayout,
const VkImageSubresourceRange &subresourceRange) {
@ -118,17 +102,6 @@ void transitionImageLayout(VkCommandBuffer commandBuffer, VkImage image,
});
}
static void submit(VkQueue queue, VkCommandBuffer cmdBuffer) {
VkSubmitInfo submit{
.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO,
.commandBufferCount = 1,
.pCommandBuffers = &cmdBuffer,
};
VK_VERIFY(vkQueueSubmit(queue, 1, &submit, nullptr));
vkQueueWaitIdle(queue);
}
static void usage(std::FILE *out, const char *argv0) {
std::fprintf(out, "usage: %s [options...]\n", argv0);
std::fprintf(out, " options:\n");
@ -374,12 +347,6 @@ int main(int argc, const char *argv[]) {
VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT);
vkContext.createSwapchain();
std::vector<vk::CommandBuffer> presentCmdBuffers(
vkContext.swapchainImages.size());
for (auto &cmdBuffer : presentCmdBuffers) {
cmdBuffer = commandPool.createPrimaryBuffer({});
}
amdgpu::bridge::BridgePuller bridgePuller{bridge};
amdgpu::bridge::Command commandsBuffer[1];
@ -597,14 +564,11 @@ int main(int argc, const char *argv[]) {
case amdgpu::bridge::CommandId::Flip: {
if (!isImageAcquired) {
vkWaitForFences(vkContext.device, 1,
&vkContext.inFlightFences[imageIndex], VK_TRUE,
UINT64_MAX);
while (true) {
auto acquireNextImageResult = vkAcquireNextImageKHR(
vkContext.device, vkContext.swapchain, UINT64_MAX,
vkContext.presentCompleteSemaphore, nullptr, &imageIndex);
vkContext.presentCompleteSemaphore, VK_NULL_HANDLE,
&imageIndex);
if (acquireNextImageResult == VK_ERROR_OUT_OF_DATE_KHR) {
vkContext.recreateSwapchain();
continue;
@ -613,18 +577,11 @@ int main(int argc, const char *argv[]) {
VK_VERIFY(acquireNextImageResult);
break;
}
vkResetFences(vkContext.device, 1,
&vkContext.inFlightFences[imageIndex]);
}
vkResetCommandBuffer(presentCmdBuffers[imageIndex], 0);
if (!device.flip(cmd.flip.pid, cmd.flip.bufferIndex, cmd.flip.arg,
presentCmdBuffers[imageIndex],
vkContext.swapchainImages[imageIndex],
vkContext.swapchainImageViews[imageIndex],
vkContext.inFlightFences[imageIndex])) {
vkContext.swapchainImageViews[imageIndex])) {
isImageAcquired = true;
break;
}
@ -641,6 +598,8 @@ int main(int argc, const char *argv[]) {
auto vkQueuePresentResult =
vkQueuePresentKHR(vkContext.presentQueue, &presentInfo);
isImageAcquired = false;
if (vkQueuePresentResult == VK_ERROR_OUT_OF_DATE_KHR) {
vkContext.recreateSwapchain();
} else {
@ -678,4 +637,6 @@ int main(int argc, const char *argv[]) {
}
}
}
vkDeviceWaitIdle(vk::context->device);
}