nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vulkan and dx12 fixes

Browse Source
This commit is contained in:
turanszkij
2019-07-16 21:36:58 +01:00
parent 3d0f10e5e3
commit ceda25eec0
6 changed files with 372 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/wiGraphicsDevice_DX12.cpp
+58 -17
View File
@@ -3139,66 +3139,66 @@ namespace wiGraphics
{
if (pResource->resource != WI_NULL_HANDLE)
{
((ID3D12Resource*)pResource->resource)->Release();
DeferredDestroy({ DestroyItem::RESOURCE, FRAMECOUNT, pResource->resource });
pResource->resource = WI_NULL_HANDLE;
}
ResourceAllocator->free(pResource->SRV);
DeferredDestroy({ DestroyItem::RESOURCEVIEW, FRAMECOUNT, pResource->SRV });
pResource->SRV = WI_NULL_HANDLE;
for (auto& x : pResource->additionalSRVs)
{
ResourceAllocator->free(x);
DeferredDestroy({ DestroyItem::RESOURCEVIEW, FRAMECOUNT, x });
}
pResource->additionalSRVs.clear();
ResourceAllocator->free(pResource->UAV);
DeferredDestroy({ DestroyItem::RESOURCEVIEW, FRAMECOUNT, pResource->UAV });
pResource->UAV = WI_NULL_HANDLE;
for (auto& x : pResource->additionalUAVs)
{
ResourceAllocator->free(x);
DeferredDestroy({ DestroyItem::RESOURCEVIEW, FRAMECOUNT, x });
}
pResource->additionalUAVs.clear();
}
void GraphicsDevice_DX12::DestroyBuffer(GPUBuffer *pBuffer)
{
ResourceAllocator->free(pBuffer->CBV);
DeferredDestroy({ DestroyItem::RESOURCEVIEW, FRAMECOUNT, pBuffer->CBV });
pBuffer->CBV = WI_NULL_HANDLE;
}
void GraphicsDevice_DX12::DestroyTexture1D(Texture1D *pTexture1D)
{
RTAllocator->free(pTexture1D->RTV);
DeferredDestroy({ DestroyItem::RENDERTARGETVIEW, FRAMECOUNT, pTexture1D->RTV });
pTexture1D->RTV = WI_NULL_HANDLE;
for (auto& x : pTexture1D->additionalRTVs)
{
RTAllocator->free(x);
DeferredDestroy({ DestroyItem::RENDERTARGETVIEW, FRAMECOUNT, x });
}
pTexture1D->additionalRTVs.clear();
}
void GraphicsDevice_DX12::DestroyTexture2D(Texture2D *pTexture2D)
{
RTAllocator->free(pTexture2D->RTV);
DeferredDestroy({ DestroyItem::RENDERTARGETVIEW, FRAMECOUNT, pTexture2D->RTV });
pTexture2D->RTV = WI_NULL_HANDLE;
for (auto& x : pTexture2D->additionalRTVs)
{
RTAllocator->free(x);
DeferredDestroy({ DestroyItem::RENDERTARGETVIEW, FRAMECOUNT, x });
}
pTexture2D->additionalRTVs.clear();
DSAllocator->free(pTexture2D->DSV);
DeferredDestroy({ DestroyItem::DEPTHSTENCILVIEW, FRAMECOUNT, pTexture2D->DSV });
pTexture2D->DSV = WI_NULL_HANDLE;
for (auto& x : pTexture2D->additionalDSVs)
{
DSAllocator->free(x);
DeferredDestroy({ DestroyItem::DEPTHSTENCILVIEW, FRAMECOUNT, x });
}
pTexture2D->additionalDSVs.clear();
}
void GraphicsDevice_DX12::DestroyTexture3D(Texture3D *pTexture3D)
{
RTAllocator->free(pTexture3D->RTV);
DeferredDestroy({ DestroyItem::RENDERTARGETVIEW, FRAMECOUNT, pTexture3D->RTV });
pTexture3D->RTV = WI_NULL_HANDLE;
for (auto& x : pTexture3D->additionalRTVs)
{
RTAllocator->free(x);
DeferredDestroy({ DestroyItem::RENDERTARGETVIEW, FRAMECOUNT, x });
}
pTexture3D->additionalRTVs.clear();
}
@@ -3230,7 +3230,7 @@ namespace wiGraphics
{
if (pComputeShader->resource != WI_NULL_HANDLE)
{
((ID3D12PipelineState*)pComputeShader->resource)->Release();
DeferredDestroy({ DestroyItem::PIPELINE, FRAMECOUNT, pComputeShader->resource });
pComputeShader->resource = WI_NULL_HANDLE;
}
}
@@ -3248,7 +3248,7 @@ namespace wiGraphics
}
void GraphicsDevice_DX12::DestroySamplerState(Sampler *pSamplerState)
{
SamplerAllocator->free(pSamplerState->resource);
DeferredDestroy({ DestroyItem::SAMPLER, FRAMECOUNT, pSamplerState->resource });
}
void GraphicsDevice_DX12::DestroyQuery(GPUQuery *pQuery)
{
@@ -3258,7 +3258,7 @@ namespace wiGraphics
{
if (pso->pipeline != WI_NULL_HANDLE)
{
((ID3D12PipelineState*)pso->pipeline)->Release();
DeferredDestroy({ DestroyItem::PIPELINE, FRAMECOUNT, pso->pipeline });
pso->pipeline = WI_NULL_HANDLE;
}
}
@@ -3394,6 +3394,47 @@ namespace wiGraphics
memset(prev_pt, 0, sizeof(prev_pt));
// Deferred destroy of resources that the GPU is already finished with:
destroylocker.lock();
while (!destroyer.empty())
{
if (destroyer.front().frame + BACKBUFFER_COUNT < FRAMECOUNT)
{
DestroyItem item = destroyer.front();
destroyer.pop_front();
switch (item.type)
{
case DestroyItem::RESOURCE:
((ID3D12Resource*)item.handle)->Release();
break;
case DestroyItem::RESOURCEVIEW:
ResourceAllocator->free(item.handle);
break;
case DestroyItem::RENDERTARGETVIEW:
RTAllocator->free(item.handle);
break;
case DestroyItem::DEPTHSTENCILVIEW:
DSAllocator->free(item.handle);
break;
case DestroyItem::SAMPLER:
SamplerAllocator->free(item.handle);
break;
case DestroyItem::PIPELINE:
((ID3D12PipelineState*)item.handle)->Release();
break;
default:
break;
}
}
else
{
break;
}
}
destroylocker.unlock();
RESOLUTIONCHANGED = false;
}
WickedEngine/wiGraphicsDevice_DX12.h
+24
View File
@@ -10,6 +10,7 @@
#include <dxgi1_4.h>
#include <d3d12.h>
#include <deque>
#include <atomic>
#include <mutex>
@@ -144,6 +145,29 @@ namespace wiGraphics
wiContainers::ThreadSafeRingBuffer<CommandList, COMMANDLIST_COUNT> free_commandlists;
wiContainers::ThreadSafeRingBuffer<CommandList, COMMANDLIST_COUNT> active_commandlists;
struct DestroyItem
{
enum TYPE
{
RESOURCE,
RESOURCEVIEW,
RENDERTARGETVIEW,
DEPTHSTENCILVIEW,
SAMPLER,
PIPELINE,
} type;
uint64_t frame;
wiCPUHandle handle;
};
std::deque<DestroyItem> destroyer;
std::mutex destroylocker;
inline void DeferredDestroy(const DestroyItem& item)
{
destroylocker.lock();
destroyer.push_back(item);
destroylocker.unlock();
}
public:
GraphicsDevice_DX12(wiWindowRegistration::window_type window, bool fullscreen = false, bool debuglayer = false);
virtual ~GraphicsDevice_DX12();
WickedEngine/wiGraphicsDevice_Vulkan.cpp
+261 -188
View File
File diff suppressed because it is too large Load Diff
WickedEngine/wiGraphicsDevice_Vulkan.h
+25
View File
@@ -21,6 +21,7 @@
#include <vector>
#include <unordered_map>
#include <deque>
#include <atomic>
#include <mutex>
@@ -202,6 +203,30 @@ namespace wiGraphics
wiContainers::ThreadSafeRingBuffer<CommandList, COMMANDLIST_COUNT> free_commandlists;
wiContainers::ThreadSafeRingBuffer<CommandList, COMMANDLIST_COUNT> active_commandlists;
struct DestroyItem
{
enum TYPE
{
DEVICEMEMORY,
IMAGE,
IMAGEVIEW,
BUFFER,
BUFFERVIEW,
SAMPLER,
PIPELINE,
} type;
uint64_t frame;
wiCPUHandle handle;
};
std::deque<DestroyItem> destroyer;
std::mutex destroylocker;
inline void DeferredDestroy(const DestroyItem& item)
{
destroylocker.lock();
destroyer.push_back(item);
destroylocker.unlock();
}
public:
GraphicsDevice_Vulkan(wiWindowRegistration::window_type window, bool fullscreen = false, bool debuglayer = false);
virtual ~GraphicsDevice_Vulkan();
WickedEngine/wiResourceManager.cpp
+3 -3
View File
@@ -249,10 +249,10 @@ const void* wiResourceManager::add(const wiHashString& name, Data_Type newType)
desc.Usage = USAGE_DEFAULT;
UINT mipwidth = width;
SubresourceData* InitData = new SubresourceData[desc.MipLevels];
std::vector<SubresourceData> InitData(desc.MipLevels);
for (UINT mip = 0; mip < desc.MipLevels; ++mip)
{
InitData[mip].pSysMem = rgb;
InitData[mip].pSysMem = rgb; // attention! we don't fill the mips here correctly, just always point to the mip0 data by default. Mip levels will be created using compute shader when needed!
InitData[mip].SysMemPitch = static_cast<UINT>(mipwidth * channelCount);
mipwidth = std::max(1u, mipwidth / 2);
}
@@ -260,7 +260,7 @@ const void* wiResourceManager::add(const wiHashString& name, Data_Type newType)
Texture2D* image = new Texture2D;
image->RequestIndependentShaderResourcesForMIPs(true);
image->RequestIndependentUnorderedAccessResourcesForMIPs(true);
HRESULT hr = wiRenderer::GetDevice()->CreateTexture2D(&desc, InitData, image);
HRESULT hr = wiRenderer::GetDevice()->CreateTexture2D(&desc, InitData.data(), image);
assert(SUCCEEDED(hr));
wiRenderer::GetDevice()->SetName(image, nameStr);
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates
const int minor = 27;
// minor bug fixes, alterations, refactors, updates
const int revision = 6;
const int revision = 7;
long GetVersion()