lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid text rendering resources leaking out when using D3D12On7

Browse Source
This commit is contained in:
baldurk
2020-01-13 18:19:23 +00:00
parent 86f39640d0
commit 90e414d097
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_rendertext.cpp
+16 -11
View File
@@ -28,6 +28,7 @@
#include "maths/vec.h"
#include "stb/stb_truetype.h"
#include "strings/string_utils.h"
#include "d3d12_command_list.h"
#include "d3d12_device.h"
#include "d3d12_shader_cache.h"
@@ -526,8 +527,10 @@ void D3D12TextRenderer::RenderTextInternal(ID3D12GraphicsCommandList *list, floa
CharBuffer->Unmap(0, NULL);
// the list is used unwrapped to avoid weird ordering bugs and potentially 'poisoning' the
// resource record on 12On7 with our own rendering
{
list->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
Unwrap(list)->IASetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
D3D12_VIEWPORT view;
view.TopLeftX = 0;
@@ -536,25 +539,27 @@ void D3D12TextRenderer::RenderTextInternal(ID3D12GraphicsCommandList *list, floa
view.Height = (float)GetHeight();
view.MinDepth = 0.0f;
view.MaxDepth = 1.0f;
list->RSSetViewports(1, &view);
Unwrap(list)->RSSetViewports(1, &view);
D3D12_RECT scissor = {0, 0, GetWidth(), GetHeight()};
list->RSSetScissorRects(1, &scissor);
Unwrap(list)->RSSetScissorRects(1, &scissor);
list->SetPipelineState(Pipe[m_BBFmtIdx]);
list->SetGraphicsRootSignature(RootSig);
Unwrap(list)->SetPipelineState(Unwrap(Pipe[m_BBFmtIdx]));
Unwrap(list)->SetGraphicsRootSignature(Unwrap(RootSig));
// Set the descriptor heap containing the texture srv
list->SetDescriptorHeaps(1, &descHeap);
ID3D12DescriptorHeap *unwrappedHeap = Unwrap(descHeap);
Unwrap(list)->SetDescriptorHeaps(1, &unwrappedHeap);
list->SetGraphicsRootConstantBufferView(
Unwrap(list)->SetGraphicsRootConstantBufferView(
0, Constants->GetGPUVirtualAddress() + ConstRingIdx * constantAlignment);
list->SetGraphicsRootConstantBufferView(1, GlyphData->GetGPUVirtualAddress());
list->SetGraphicsRootConstantBufferView(
Unwrap(list)->SetGraphicsRootConstantBufferView(1, GlyphData->GetGPUVirtualAddress());
Unwrap(list)->SetGraphicsRootConstantBufferView(
2, CharBuffer->GetGPUVirtualAddress() + charOffset * sizeof(Vec4f));
list->SetGraphicsRootDescriptorTable(3, descHeap->GetGPUDescriptorHandleForHeapStart());
Unwrap(list)->SetGraphicsRootDescriptorTable(
3, Unwrap(descHeap->GetGPUDescriptorHandleForHeapStart()));
list->DrawInstanced(4, (uint32_t)chars, 0, 0);
Unwrap(list)->DrawInstanced(4, (uint32_t)chars, 0, 0);
}
ConstRingIdx++;