diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index bf2c87be..e78f513b 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -12,12 +12,14 @@ namespace dxvk { const Rc& metaClearObjects, const Rc& metaCopyObjects, const Rc& metaMipGenObjects, + const Rc& metaPackObjects, const Rc& metaResolveObjects) : m_device (device), m_pipeMgr (pipelineManager), m_metaClear (metaClearObjects), m_metaCopy (metaCopyObjects), m_metaMipGen (metaMipGenObjects), + m_metaPack (metaPackObjects), m_metaResolve (metaResolveObjects), m_queries (device->vkd()) { } @@ -917,8 +919,8 @@ namespace dxvk { m_cmd->trackResource(srcImage); m_cmd->trackResource(dstSlice.resource()); } - - + + void DxvkContext::discardBuffer( const Rc& buffer) { if (m_barriers.isBufferDirty(buffer->slice(), DxvkAccess::Write)) diff --git a/src/dxvk/dxvk_context.h b/src/dxvk/dxvk_context.h index 4f2b1918..dd54fc9c 100644 --- a/src/dxvk/dxvk_context.h +++ b/src/dxvk/dxvk_context.h @@ -9,6 +9,7 @@ #include "dxvk_meta_clear.h" #include "dxvk_meta_copy.h" #include "dxvk_meta_mipgen.h" +#include "dxvk_meta_pack.h" #include "dxvk_meta_resolve.h" #include "dxvk_pipecache.h" #include "dxvk_pipemanager.h" @@ -36,6 +37,7 @@ namespace dxvk { const Rc& metaClearObjects, const Rc& metaCopyObjects, const Rc& metaMipGenObjects, + const Rc& metaPackObjects, const Rc& metaResolveObjects); ~DxvkContext(); @@ -739,6 +741,7 @@ namespace dxvk { const Rc m_metaClear; const Rc m_metaCopy; const Rc m_metaMipGen; + const Rc m_metaPack; const Rc m_metaResolve; Rc m_cmd; diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp index ed59f0e3..b64aec6c 100644 --- a/src/dxvk/dxvk_device.cpp +++ b/src/dxvk/dxvk_device.cpp @@ -20,6 +20,7 @@ namespace dxvk { m_metaClearObjects (new DxvkMetaClearObjects (vkd)), m_metaCopyObjects (new DxvkMetaCopyObjects (vkd)), m_metaMipGenObjects (new DxvkMetaMipGenObjects (vkd)), + m_metaPackObjects (new DxvkMetaPackObjects (vkd)), m_metaResolveObjects(new DxvkMetaResolveObjects (vkd)), m_unboundResources (this), m_submissionQueue (this) { @@ -121,6 +122,7 @@ namespace dxvk { m_metaClearObjects, m_metaCopyObjects, m_metaMipGenObjects, + m_metaPackObjects, m_metaResolveObjects); } diff --git a/src/dxvk/dxvk_device.h b/src/dxvk/dxvk_device.h index de7c763d..7be4cc8b 100644 --- a/src/dxvk/dxvk_device.h +++ b/src/dxvk/dxvk_device.h @@ -401,6 +401,7 @@ namespace dxvk { Rc m_metaClearObjects; Rc m_metaCopyObjects; Rc m_metaMipGenObjects; + Rc m_metaPackObjects; Rc m_metaResolveObjects; DxvkUnboundResources m_unboundResources;