AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-05-17 04:41:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

D3D12 render-target delete fix

Browse Source
This commit is contained in:
Jack Andersen 2015-12-08 15:04:06 -10:00
parent 6062302816
commit e43b3671b3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/graphicsdev/D3D12.cpp
View File

@ -426,8 +426,9 @@ class D3D12TextureR : public ITextureR
} }
} }
D3D12TextureR(D3D12Context* ctx, size_t width, size_t height, size_t samples) D3D12CommandQueue* m_q;
: m_width(width), m_height(height), m_samples(samples) D3D12TextureR(D3D12Context* ctx, D3D12CommandQueue* q, size_t width, size_t height, size_t samples)
: m_q(q), m_width(width), m_height(height), m_samples(samples)
{ {
if (samples == 0) m_samples = 1; if (samples == 0) m_samples = 1;
Setup(ctx, width, height, samples); Setup(ctx, width, height, samples);
@ -439,7 +440,7 @@ public:
ComPtr<ID3D12Resource> m_depthTex; ComPtr<ID3D12Resource> m_depthTex;
ComPtr<ID3D12DescriptorHeap> m_rtvHeap; ComPtr<ID3D12DescriptorHeap> m_rtvHeap;
ComPtr<ID3D12DescriptorHeap> m_dsvHeap; ComPtr<ID3D12DescriptorHeap> m_dsvHeap;
~D3D12TextureR() = default; ~D3D12TextureR();
void resize(D3D12Context* ctx, size_t width, size_t height) void resize(D3D12Context* ctx, size_t width, size_t height)
{ {
@ -1166,6 +1167,12 @@ struct D3D12CommandQueue : IGraphicsCommandQueue
void execute(); void execute();
}; };
D3D12TextureR::~D3D12TextureR()
{
if (m_q->m_boundTarget == this)
m_q->m_boundTarget = nullptr;
}
void D3D12GraphicsBufferD::update(int b) void D3D12GraphicsBufferD::update(int b)
{ {
int slot = 1 << b; int slot = 1 << b;
@ -1344,7 +1351,7 @@ public:
ITextureR* newRenderTexture(size_t width, size_t height, size_t samples) ITextureR* newRenderTexture(size_t width, size_t height, size_t samples)
{ {
D3D12CommandQueue* q = static_cast<D3D12CommandQueue*>(m_parent->getCommandQueue()); D3D12CommandQueue* q = static_cast<D3D12CommandQueue*>(m_parent->getCommandQueue());
D3D12TextureR* retval = new D3D12TextureR(m_ctx, width, height, samples); D3D12TextureR* retval = new D3D12TextureR(m_ctx, q, width, height, samples);
static_cast<D3D12Data*>(m_deferredData)->m_RTexs.emplace_back(retval); static_cast<D3D12Data*>(m_deferredData)->m_RTexs.emplace_back(retval);
return retval; return retval;
} }