TheSpydog
/
Refresh
forked from MoonsideGames/Refresh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stub out D3D11_Wait, fix crash when unclaiming windows, fix backend order

Caleb Cornett 2023-09-29 20:52:14 -05:00
parent a91802cbe9
commit 9e7589d844
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Refresh.c
View File

@ -53,8 +53,8 @@
static const Refresh_Driver *backends[] = { static const Refresh_Driver *backends[] = {
NULL, NULL,
D3D11_DRIVER,
VULKAN_DRIVER, VULKAN_DRIVER,
D3D11_DRIVER,
PS5_DRIVER PS5_DRIVER
}; };

12
src/Refresh_Driver_D3D11.c
View File

@ -1273,13 +1273,19 @@ static Refresh_Texture* D3D11_AcquireSwapchainTexture(
) { ) {
D3D11Renderer *renderer = (D3D11Renderer*) driverData; D3D11Renderer *renderer = (D3D11Renderer*) driverData;
D3D11CommandBuffer *cmdbuf = (D3D11CommandBuffer*) commandBuffer; D3D11CommandBuffer *cmdbuf = (D3D11CommandBuffer*) commandBuffer;
D3D11WindowData *windowData;
D3D11SwapchainData *swapchainData; D3D11SwapchainData *swapchainData;
DXGI_SWAP_CHAIN_DESC swapchainDesc; DXGI_SWAP_CHAIN_DESC swapchainDesc;
int w, h; int w, h;
HRESULT res; HRESULT res;
/* Fetch the window and swapchain data. */ windowData = D3D11_INTERNAL_FetchWindowData(windowHandle);
swapchainData = D3D11_INTERNAL_FetchWindowData(windowHandle)->swapchainData; if (windowData == NULL)
{
return NULL;
}
swapchainData = windowData->swapchainData;
if (swapchainData == NULL) if (swapchainData == NULL)
{ {
return NULL; return NULL;
@ -1387,7 +1393,7 @@ static Refresh_Fence* D3D11_SubmitAndAcquireFence(
static void D3D11_Wait( static void D3D11_Wait(
Refresh_Renderer *driverData Refresh_Renderer *driverData
) { ) {
NOT_IMPLEMENTED /* FIXME: Anything we need to do here? */
} }
static void D3D11_WaitForFences( static void D3D11_WaitForFences(

5
src/Refresh_Driver_Vulkan.c
View File

@ -9756,6 +9756,11 @@ static Refresh_Texture* VULKAN_AcquireSwapchainTexture(
VulkanPresentData *presentData; VulkanPresentData *presentData;
windowData = VULKAN_INTERNAL_FetchWindowData(windowHandle); windowData = VULKAN_INTERNAL_FetchWindowData(windowHandle);
if (windowData == NULL)
{
return NULL;
}
swapchainData = windowData->swapchainData; swapchainData = windowData->swapchainData;
/* Window is claimed but swapchain is invalid! */ /* Window is claimed but swapchain is invalid! */