cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-01-21 07:40:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed sync issue with swap chain readback

Browse source
This commit is contained in:
myT 2023-11-18 04:17:11 +01:00
parent 61fbcb5304
commit b91e20a1b9
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/renderer/grp_local.h
View file

@ -680,6 +680,8 @@ struct GRP : IRenderPipeline
uint32_t CreatePSO(CachedPSO& cache, const char* name);
void UpdateReadbackTexture();
UI ui;
World world;
MipMapGenerator mipMapGen;
@ -689,12 +691,14 @@ struct GRP : IRenderPipeline
bool firstInit = true;
RenderMode::Id renderMode; // necessary for sampler selection, useful for debugging
float frameSeed;
bool updateReadbackTexture;
// @TODO: what's up with rootSignature and uberRootSignature?
// probably need to nuke one of them...
HTexture renderTarget;
TextureFormat::Id renderTargetFormat;
HTexture readbackRenderTarget;
RootSignatureDesc rootSignatureDesc;
HRootSignature rootSignature;
HDescriptorTable descriptorTable;

31
code/renderer/grp_main.cpp
View file

@ -279,6 +279,18 @@ void GRP::Init()
renderTarget = RHI::CreateTexture(desc);
}
{
TextureDesc desc("readback render target", glConfig.vidWidth, glConfig.vidHeight);
desc.initialState = ResourceStates::RenderTargetBit;
desc.allowedState = ResourceStates::RenderTargetBit | ResourceStates::PixelShaderAccessBit;
Vector4Clear(desc.clearColor);
desc.usePreferredClearValue = true;
desc.committedResource = true;
desc.format = TextureFormat::RGBA32_UNorm;
desc.shortLifeTime = true;
readbackRenderTarget = RHI::CreateTexture(desc);
}
ui.Init();
world.Init();
mipMapGen.Init();
@ -328,6 +340,7 @@ void GRP::EndFrame()
imgui.Draw();
post.Draw("Post-process", GetSwapChainTexture());
world.EndFrame();
UpdateReadbackTexture();
RHI::EndFrame();
if(rhie.presentToPresentUS > 0)
@ -346,6 +359,16 @@ void GRP::EndFrame()
}
}
void GRP::UpdateReadbackTexture()
{
if(!updateReadbackTexture)
{
return;
}
post.Draw("Readback post-process", readbackRenderTarget);
}
void GRP::CreateTexture(image_t* image, int mipCount, int width, int height)
{
TextureDesc desc(image->name, width, height, mipCount);
@ -863,6 +886,10 @@ uint32_t GRP::CreatePSO(CachedPSO& cache, const char* name)
void GRP::ExecuteRenderCommands(const byte* data)
{
updateReadbackTexture =
R_FindRenderCommand(RC_SCREENSHOT) != NULL ||
R_FindRenderCommand(RC_VIDEOFRAME) != NULL;
for(;;)
{
const int commandId = ((const renderCommandBase_t*)data)->commandId;
@ -931,10 +958,8 @@ void GRP::ExecuteRenderCommands(const byte* data)
void GRP::ReadPixels(int w, int h, int alignment, colorSpace_t colorSpace, void* outPixels)
{
const HTexture sourceTexture = GetSwapChainTexture();
MappedTexture mapped;
BeginTextureReadback(mapped, sourceTexture);
BeginTextureReadback(mapped, grp.readbackRenderTarget);
byte* const out0 = (byte*)outPixels;
const byte* const in0 = mapped.mappedData;