Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare shader reload.

Browse Source 
- Expose wait until gpus is idle to api
- Alt+R to reload
This commit is contained in:
Patedam
2025-03-15 19:55:41 -04:00
parent f01c8c3ccb
commit c9cd01bb31
8 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Juliet/include/Core/HAL/Keyboard/Keyboard.h
View File

@@ -20,8 +20,8 @@ namespace Juliet
uint16 Raw;
};
extern bool IsKeyDown(ScanCode scanCode);
extern JULIET_API bool IsKeyDown(ScanCode scanCode);
extern KeyMod GetKeyModState();
extern KeyCode GetKeyCodeFromScanCode(ScanCode scanCode, KeyMod keyModState);
extern JULIET_API KeyMod GetKeyModState();
extern JULIET_API KeyCode GetKeyCodeFromScanCode(ScanCode scanCode, KeyMod keyModState);
} // namespace Juliet

3
Juliet/include/Graphics/Graphics.h
View File

@@ -118,6 +118,9 @@ namespace Juliet
extern JULIET_API void DrawPrimitives(NonNullPtr<RenderPass> renderPass, uint32 numVertices, uint32 numInstances,
uint32 firstVertex, uint32 firstInstance);
// Fences
extern JULIET_API bool WaitUntilGPUIsIdle(NonNullPtr<GraphicsDevice> device);
// Shaders
extern JULIET_API Shader* CreateShader(NonNullPtr<GraphicsDevice> device, String filename, ShaderCreateInfo& shaderCreateInfo);
extern JULIET_API void DestroyShader(NonNullPtr<GraphicsDevice> device, NonNullPtr<Shader> shader);

4
Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.cpp
View File

@@ -406,7 +406,7 @@ namespace Juliet::D3D12
auto* windowData = d3d12Driver->WindowData;
Assert(windowData && "Trying to destroy a swapchain but no Window Data exists");
Wait(driver);
WaitUntilGPUIsIdle(driver);
for (uint32 idx = 0; idx < GPUDriver::kMaxFramesInFlight; idx += 1)
{
@@ -748,7 +748,7 @@ namespace Juliet::D3D12
device->SetStencilReference = SetStencilReference;
device->BindGraphicsPipeline = BindGraphicsPipeline;
device->DrawPrimitives = DrawPrimitives;
device->Wait = Wait;
device->WaitUntilGPUIsIdle = WaitUntilGPUIsIdle;
device->QueryFence = QueryFence;
device->ReleaseFence = ReleaseFence;
device->CreateShader = CreateShader;

2
Juliet/src/Graphics/D3D12/D3D12Synchronization.cpp
View File

@@ -23,7 +23,7 @@ namespace Juliet::D3D12
}
} // namespace
bool Wait(NonNullPtr<GPUDriver> driver)
bool WaitUntilGPUIsIdle(NonNullPtr<GPUDriver> driver)
{
auto d3d12driver = static_cast<D3D12Driver*>(driver.Get());
D3D12Fence* fence = Internal::AcquireFence(d3d12driver);

2
Juliet/src/Graphics/D3D12/D3D12Synchronization.h
View File

@@ -25,7 +25,7 @@ namespace Juliet::D3D12
int32 ReferenceCount; // TODO : Atomic
};
extern bool Wait(NonNullPtr<GPUDriver> driver);
extern bool WaitUntilGPUIsIdle(NonNullPtr<GPUDriver> driver);
extern bool Wait(NonNullPtr<GPUDriver> driver, bool waitForAll, Fence* const* fences, uint32 numFences);
extern bool QueryFence(NonNullPtr<GPUDriver> driver, NonNullPtr<Fence> fence);
extern void ReleaseFence(NonNullPtr<GPUDriver> driver, NonNullPtr<Fence> fence);

7
Juliet/src/Graphics/Graphics.cpp
View File

@@ -258,6 +258,12 @@ namespace Juliet
commandListHeader->Device->DrawPrimitives(commandList, numVertices, numInstances, firstVertex, firstInstance);
}
// Fences
bool WaitUntilGPUIsIdle(NonNullPtr<GraphicsDevice> device)
{
return device->WaitUntilGPUIsIdle(device->Driver);
}
// Shaders
Shader* CreateShader(NonNullPtr<GraphicsDevice> device, String filename, ShaderCreateInfo& shaderCreateInfo)
{
@@ -304,5 +310,4 @@ namespace Juliet
{
device->DestroyGraphicsPipeline(device->Driver, graphicsPipeline);
}
} // namespace Juliet

2
Juliet/src/Graphics/GraphicsDevice.h
View File

@@ -69,7 +69,7 @@ namespace Juliet
uint32 firstVertex, uint32 firstInstance);
// Fences
bool (*Wait)(NonNullPtr<GPUDriver> driver);
bool (*WaitUntilGPUIsIdle)(NonNullPtr<GPUDriver> driver);
bool (*QueryFence)(NonNullPtr<GPUDriver> driver, NonNullPtr<Fence> fence);
void (*ReleaseFence)(NonNullPtr<GPUDriver> driver, NonNullPtr<Fence> fence);