From f924931d2df38b02535b019e460ee6fd89c91ee9 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Sun, 26 Nov 2017 14:01:41 +0100 Subject: [PATCH] [general] Removed TRACE calls for now --- src/d3d11/d3d11_buffer.cpp | 4 ++-- src/d3d11/d3d11_context.cpp | 16 ++-------------- src/d3d11/d3d11_device.cpp | 2 -- src/d3d11/d3d11_main.cpp | 10 ---------- src/dxgi/dxgi_adapter.cpp | 6 ++---- src/dxgi/dxgi_device.cpp | 4 +--- src/dxgi/dxgi_factory.cpp | 9 ++------- src/dxgi/dxgi_main.cpp | 5 ----- src/dxgi/dxgi_output.cpp | 6 ++---- src/dxvk/dxvk_adapter.cpp | 5 +---- src/dxvk/dxvk_buffer.cpp | 4 +--- src/dxvk/dxvk_cmdlist.cpp | 10 ---------- src/dxvk/dxvk_compute.cpp | 3 --- src/dxvk/dxvk_context.cpp | 26 +++----------------------- src/dxvk/dxvk_descriptor.cpp | 8 +------- src/dxvk/dxvk_device.cpp | 6 ------ src/dxvk/dxvk_framebuffer.cpp | 2 -- src/dxvk/dxvk_graphics.cpp | 4 ---- src/dxvk/dxvk_image.cpp | 5 +---- src/dxvk/dxvk_instance.cpp | 3 +-- src/dxvk/dxvk_memory.cpp | 2 -- src/dxvk/dxvk_pipemgr.cpp | 4 ++-- src/dxvk/dxvk_renderpass.cpp | 6 ++---- src/dxvk/dxvk_shader.cpp | 4 ---- src/dxvk/dxvk_surface.cpp | 3 +-- src/dxvk/dxvk_swapchain.cpp | 8 -------- src/dxvk/dxvk_sync.cpp | 9 --------- 27 files changed, 24 insertions(+), 150 deletions(-) diff --git a/src/d3d11/d3d11_buffer.cpp b/src/d3d11/d3d11_buffer.cpp index 1aae7f72..e10a5fe4 100644 --- a/src/d3d11/d3d11_buffer.cpp +++ b/src/d3d11/d3d11_buffer.cpp @@ -8,12 +8,12 @@ namespace dxvk { const D3D11_BUFFER_DESC& desc) : m_device(device), m_desc(desc), m_buffer(this->createBuffer()) { - TRACE(this, device); + } D3D11Buffer::~D3D11Buffer() { - TRACE(this); + } diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp index ddcb56e8..bd58c7b2 100644 --- a/src/d3d11/d3d11_context.cpp +++ b/src/d3d11/d3d11_context.cpp @@ -8,12 +8,12 @@ namespace dxvk { Rc device) : m_parent(parent), m_device(device) { - TRACE(this, parent, device); + } D3D11DeviceContext::~D3D11DeviceContext() { - TRACE(this); + } @@ -226,8 +226,6 @@ namespace dxvk { void D3D11DeviceContext::Draw( UINT VertexCount, UINT StartVertexLocation) { - TRACE(this, VertexCount, StartVertexLocation); - m_context->draw( VertexCount, 1, StartVertexLocation, 0); @@ -238,8 +236,6 @@ namespace dxvk { UINT IndexCount, UINT StartIndexLocation, INT BaseVertexLocation) { - TRACE(this, IndexCount, StartIndexLocation, BaseVertexLocation); - m_context->drawIndexed( IndexCount, 1, StartIndexLocation, @@ -252,9 +248,6 @@ namespace dxvk { UINT InstanceCount, UINT StartVertexLocation, UINT StartInstanceLocation) { - TRACE(this, VertexCountPerInstance, InstanceCount, - StartVertexLocation, StartInstanceLocation); - m_context->draw( VertexCountPerInstance, InstanceCount, @@ -269,9 +262,6 @@ namespace dxvk { UINT StartIndexLocation, INT BaseVertexLocation, UINT StartInstanceLocation) { - TRACE(this, IndexCountPerInstance, InstanceCount, - StartIndexLocation, BaseVertexLocation, StartInstanceLocation); - m_context->drawIndexed( IndexCountPerInstance, InstanceCount, @@ -299,8 +289,6 @@ namespace dxvk { UINT ThreadGroupCountX, UINT ThreadGroupCountY, UINT ThreadGroupCountZ) { - TRACE(this, ThreadGroupCountX, ThreadGroupCountY, ThreadGroupCountZ); - m_context->dispatch( ThreadGroupCountX, ThreadGroupCountY, diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp index ed28b71e..efedcdec 100644 --- a/src/d3d11/d3d11_device.cpp +++ b/src/d3d11/d3d11_device.cpp @@ -15,14 +15,12 @@ namespace dxvk { m_featureFlags(featureFlags), m_dxvkDevice (m_dxgiDevice->GetDXVKDevice()), m_dxvkAdapter (m_dxvkDevice->adapter()) { - TRACE(this, dxgiDevice, featureLevel, featureFlags); m_dxgiDevice->SetDeviceLayer(this); m_context = new D3D11DeviceContext(this, m_dxvkDevice); } D3D11Device::~D3D11Device() { - TRACE(this); m_dxgiDevice->SetDeviceLayer(nullptr); } diff --git a/src/d3d11/d3d11_main.cpp b/src/d3d11/d3d11_main.cpp index 9e942917..ef256959 100644 --- a/src/d3d11/d3d11_main.cpp +++ b/src/d3d11/d3d11_main.cpp @@ -19,11 +19,6 @@ extern "C" { ID3D11Device **ppDevice, D3D_FEATURE_LEVEL *pFeatureLevel, ID3D11DeviceContext **ppImmediateContext) { - TRACE(pAdapter, DriverType, Software, - Flags, pFeatureLevels, FeatureLevels, - SDKVersion, ppDevice, pFeatureLevel, - ppImmediateContext); - Com dxgiAdapter = pAdapter; Com dxvkAdapter = nullptr; @@ -147,11 +142,6 @@ extern "C" { ID3D11Device **ppDevice, D3D_FEATURE_LEVEL *pFeatureLevel, ID3D11DeviceContext **ppImmediateContext) { - TRACE(pAdapter, DriverType, Software, - Flags, pFeatureLevels, FeatureLevels, - SDKVersion, pSwapChainDesc, ppSwapChain, - ppDevice, pFeatureLevel, ppImmediateContext); - // Try to create a device first. HRESULT status = D3D11CreateDevice(pAdapter, DriverType, Software, Flags, pFeatureLevels, FeatureLevels, diff --git a/src/dxgi/dxgi_adapter.cpp b/src/dxgi/dxgi_adapter.cpp index 97e6e174..ba2a5c86 100644 --- a/src/dxgi/dxgi_adapter.cpp +++ b/src/dxgi/dxgi_adapter.cpp @@ -12,12 +12,12 @@ namespace dxvk { const Rc& adapter) : m_factory (factory), m_adapter (adapter) { - TRACE(this, factory, adapter); + } DxgiAdapter::~DxgiAdapter() { - TRACE(this); + } @@ -52,8 +52,6 @@ namespace dxvk { HRESULT DxgiAdapter::EnumOutputs( UINT Output, IDXGIOutput **ppOutput) { - TRACE(this, Output, ppOutput); - if (ppOutput == nullptr) return DXGI_ERROR_INVALID_CALL; diff --git a/src/dxgi/dxgi_device.cpp b/src/dxgi/dxgi_device.cpp index 15d18904..cf35c7cc 100644 --- a/src/dxgi/dxgi_device.cpp +++ b/src/dxgi/dxgi_device.cpp @@ -5,13 +5,12 @@ namespace dxvk { DxgiDevice::DxgiDevice(IDXVKAdapter* adapter) : m_adapter(adapter) { - TRACE(this, adapter); m_device = m_adapter->GetDXVKAdapter()->createDevice(); } DxgiDevice::~DxgiDevice() { - TRACE(this); + } @@ -79,7 +78,6 @@ namespace dxvk { void DxgiDevice::SetDeviceLayer(IUnknown* layer) { - TRACE(this, layer); m_layer = layer; } diff --git a/src/dxgi/dxgi_factory.cpp b/src/dxgi/dxgi_factory.cpp index 217dd28d..102409ef 100644 --- a/src/dxgi/dxgi_factory.cpp +++ b/src/dxgi/dxgi_factory.cpp @@ -6,12 +6,12 @@ namespace dxvk { DxgiFactory::DxgiFactory() : m_instance(new DxvkInstance()), m_adapters(m_instance->enumAdapters()) { - TRACE(this); + } DxgiFactory::~DxgiFactory() { - TRACE(this); + } @@ -47,8 +47,6 @@ namespace dxvk { IUnknown* pDevice, DXGI_SWAP_CHAIN_DESC* pDesc, IDXGISwapChain** ppSwapChain) { - TRACE(this, pDevice, pDesc, ppSwapChain); - if (ppSwapChain == nullptr || pDesc == nullptr) return E_INVALIDARG; @@ -65,8 +63,6 @@ namespace dxvk { HRESULT DxgiFactory::EnumAdapters( UINT Adapter, IDXGIAdapter** ppAdapter) { - TRACE(this, Adapter, ppAdapter); - if (ppAdapter == nullptr) return DXGI_ERROR_INVALID_CALL; @@ -89,7 +85,6 @@ namespace dxvk { HRESULT DxgiFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags) { - TRACE(this, WindowHandle, Flags); Logger::warn("DxgiFactory::MakeWindowAssociation: Ignoring flags"); m_associatedWindow = WindowHandle; return S_OK; diff --git a/src/dxgi/dxgi_main.cpp b/src/dxgi/dxgi_main.cpp index 5fe9fa43..b7d4f559 100644 --- a/src/dxgi/dxgi_main.cpp +++ b/src/dxgi/dxgi_main.cpp @@ -5,14 +5,11 @@ namespace dxvk { struct SdlInstance { SdlInstance() { - TRACE(this); - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE)) Logger::err("Instance::init: Failed to initialize SDL"); } ~SdlInstance() { - TRACE(this); SDL_Quit(); } }; @@ -20,8 +17,6 @@ namespace dxvk { SdlInstance sdl; HRESULT createDxgiFactory(REFIID riid, void **ppFactory) { - TRACE(riid, ppFactory); - if (riid != __uuidof(IDXGIFactory)) { Logger::err("CreateDXGIFactory: Requested version of IDXGIFactory not supported"); return DXGI_ERROR_UNSUPPORTED; diff --git a/src/dxgi/dxgi_output.cpp b/src/dxgi/dxgi_output.cpp index 862460da..cfd52689 100644 --- a/src/dxgi/dxgi_output.cpp +++ b/src/dxgi/dxgi_output.cpp @@ -14,12 +14,12 @@ namespace dxvk { UINT display) : m_adapter (adapter), m_display (display) { - TRACE(this, adapter); + } DxgiOutput::~DxgiOutput() { - TRACE(this); + } @@ -90,8 +90,6 @@ namespace dxvk { UINT Flags, UINT *pNumModes, DXGI_MODE_DESC *pDesc) { - TRACE(this, EnumFormat, Flags, pNumModes, pDesc); - if (pNumModes == nullptr) return DXGI_ERROR_INVALID_CALL; diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp index c50d56fe..9d65bf38 100644 --- a/src/dxvk/dxvk_adapter.cpp +++ b/src/dxvk/dxvk_adapter.cpp @@ -13,7 +13,6 @@ namespace dxvk { : m_instance (instance), m_vki (instance->vki()), m_handle (handle) { - TRACE(this, instance, handle); uint32_t numQueueFamilies = 0; m_vki->vkGetPhysicalDeviceQueueFamilyProperties( m_handle, &numQueueFamilies, nullptr); @@ -25,7 +24,7 @@ namespace dxvk { DxvkAdapter::~DxvkAdapter() { - TRACE(this); + } @@ -95,8 +94,6 @@ namespace dxvk { Rc DxvkAdapter::createDevice() { - TRACE(this); - auto enabledExtensions = this->enableExtensions(); auto enabledFeatures = this->enableFeatures(); diff --git a/src/dxvk/dxvk_buffer.cpp b/src/dxvk/dxvk_buffer.cpp index 15a80853..5d2f546e 100644 --- a/src/dxvk/dxvk_buffer.cpp +++ b/src/dxvk/dxvk_buffer.cpp @@ -45,8 +45,6 @@ namespace dxvk { const Rc& buffer, const DxvkBufferViewCreateInfo& info) : m_vkd(vkd), m_buffer(buffer), m_info(info) { - TRACE(this, buffer); - VkBufferViewCreateInfo viewInfo; viewInfo.sType = VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO; viewInfo.pNext = nullptr; @@ -62,7 +60,7 @@ namespace dxvk { DxvkBufferView::~DxvkBufferView() { - TRACE(this); + } } \ No newline at end of file diff --git a/src/dxvk/dxvk_cmdlist.cpp b/src/dxvk/dxvk_cmdlist.cpp index 85809e15..5ed72fd4 100644 --- a/src/dxvk/dxvk_cmdlist.cpp +++ b/src/dxvk/dxvk_cmdlist.cpp @@ -6,8 +6,6 @@ namespace dxvk { const Rc& vkd, uint32_t queueFamily) : m_vkd(vkd), m_descAlloc(vkd) { - TRACE(this, queueFamily); - VkCommandPoolCreateInfo poolInfo; poolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; poolInfo.pNext = nullptr; @@ -30,7 +28,6 @@ namespace dxvk { DxvkCommandList::~DxvkCommandList() { - TRACE(this); m_resources.reset(); m_vkd->vkDestroyCommandPool( @@ -39,8 +36,6 @@ namespace dxvk { void DxvkCommandList::beginRecording() { - TRACE(this); - VkCommandBufferBeginInfo info; info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; info.pNext = nullptr; @@ -56,22 +51,17 @@ namespace dxvk { void DxvkCommandList::endRecording() { - TRACE(this); - if (m_vkd->vkEndCommandBuffer(m_buffer) != VK_SUCCESS) throw DxvkError("DxvkCommandList::endRecording: Failed to record command buffer"); } void DxvkCommandList::trackResource(const Rc& rc) { - TRACE(this, rc); m_resources.trackResource(rc); } void DxvkCommandList::reset() { - TRACE(this); - m_descAlloc.reset(); m_resources.reset(); } diff --git a/src/dxvk/dxvk_compute.cpp b/src/dxvk/dxvk_compute.cpp index ba353468..877512d3 100644 --- a/src/dxvk/dxvk_compute.cpp +++ b/src/dxvk/dxvk_compute.cpp @@ -6,8 +6,6 @@ namespace dxvk { const Rc& vkd, const Rc& shader) : m_vkd(vkd), m_shader(shader) { - TRACE(this, shader); - std::vector bindings; // TODO re-implement shader slots and bindings @@ -58,7 +56,6 @@ namespace dxvk { DxvkComputePipeline::~DxvkComputePipeline() { - TRACE(this); this->destroyObjects(); } diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index 8e2c2968..ed65c492 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -9,19 +9,17 @@ namespace dxvk { const Rc& pipeMgr) : m_device (device), m_pipeMgr (pipeMgr) { - TRACE(this, device); + } DxvkContext::~DxvkContext() { - TRACE(this); + } void DxvkContext::beginRecording( const Rc& recorder) { - TRACE(this, recorder); - m_cmd = recorder; m_cmd->beginRecording(); @@ -44,8 +42,6 @@ namespace dxvk { void DxvkContext::endRecording() { - TRACE(this); - this->renderPassEnd(); m_cmd->endRecording(); @@ -55,8 +51,6 @@ namespace dxvk { void DxvkContext::bindFramebuffer( const Rc& fb) { - TRACE(this, fb); - if (m_state.om.framebuffer != fb) { m_state.om.framebuffer = fb; this->renderPassEnd(); @@ -76,8 +70,6 @@ namespace dxvk { void DxvkContext::bindShader( VkShaderStageFlagBits stage, const Rc& shader) { - TRACE(this, stage, shader); - DxvkShaderStageState* stageState = this->getShaderStage(stage); if (stageState->shader != shader) { @@ -102,8 +94,6 @@ namespace dxvk { void DxvkContext::bindVertexBuffer( uint32_t binding, const DxvkBufferBinding& buffer) { - TRACE(this, binding); - if (m_state.vi.vertexBuffers.at(binding) != buffer) { m_state.vi.vertexBuffers.at(binding) = buffer; m_state.flags.set(DxvkContextFlag::GpDirtyVertexBuffers); @@ -114,8 +104,6 @@ namespace dxvk { void DxvkContext::clearRenderTarget( const VkClearAttachment& attachment, const VkClearRect& clearArea) { - TRACE(this); - // We only need the framebuffer to be bound. Flushing the // entire pipeline state is not required and might actually // cause problems if the current pipeline state is invalid. @@ -132,8 +120,6 @@ namespace dxvk { const Rc& srcBuffer, VkDeviceSize srcOffset, VkDeviceSize numBytes) { - TRACE(this, dstBuffer, dstOffset, srcBuffer, srcOffset, numBytes); - if (numBytes != 0) { VkBufferCopy bufferRegion; bufferRegion.srcOffset = srcOffset; @@ -167,7 +153,7 @@ namespace dxvk { uint32_t x, uint32_t y, uint32_t z) { - TRACE(this, x, y, z); + this->commitComputeState(); m_cmd->cmdDispatch(x, y, z); } @@ -178,9 +164,6 @@ namespace dxvk { uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) { - TRACE(this, vertexCount, instanceCount, - firstVertex, firstInstance); - this->commitGraphicsState(); m_cmd->cmdDraw( @@ -195,9 +178,6 @@ namespace dxvk { uint32_t firstIndex, uint32_t vertexOffset, uint32_t firstInstance) { - TRACE(this, indexCount, instanceCount, - firstIndex, vertexOffset, firstInstance); - this->commitGraphicsState(); m_cmd->cmdDrawIndexed( diff --git a/src/dxvk/dxvk_descriptor.cpp b/src/dxvk/dxvk_descriptor.cpp index f2af35fd..8e14e3fa 100644 --- a/src/dxvk/dxvk_descriptor.cpp +++ b/src/dxvk/dxvk_descriptor.cpp @@ -5,13 +5,11 @@ namespace dxvk { DxvkDescriptorAlloc::DxvkDescriptorAlloc( const Rc& vkd) : m_vkd(vkd) { - TRACE(this); + } DxvkDescriptorAlloc::~DxvkDescriptorAlloc() { - TRACE(this); - for (auto p : m_pools) { m_vkd->vkDestroyDescriptorPool( m_vkd->device(), p, nullptr); @@ -20,8 +18,6 @@ namespace dxvk { VkDescriptorSet DxvkDescriptorAlloc::alloc(VkDescriptorSetLayout layout) { - TRACE(this, layout); - VkDescriptorSet set = VK_NULL_HANDLE; if (m_poolId < m_pools.size()) @@ -53,8 +49,6 @@ namespace dxvk { VkDescriptorPool DxvkDescriptorAlloc::createDescriptorPool() { - TRACE(this); - // TODO tune these values, if necessary constexpr uint32_t MaxSets = 64; constexpr uint32_t MaxDesc = 256; diff --git a/src/dxvk/dxvk_device.cpp b/src/dxvk/dxvk_device.cpp index e340d6af..cb295df1 100644 --- a/src/dxvk/dxvk_device.cpp +++ b/src/dxvk/dxvk_device.cpp @@ -11,8 +11,6 @@ namespace dxvk { m_memory (new DxvkMemoryAllocator(adapter, vkd)), m_renderPassPool (new DxvkRenderPassPool (vkd)), m_pipelineManager (new DxvkPipelineManager(vkd)) { - TRACE(this, adapter); - m_vkd->vkGetDeviceQueue(m_vkd->device(), m_adapter->graphicsQueueFamily(), 0, &m_graphicsQueue); @@ -23,7 +21,6 @@ namespace dxvk { DxvkDevice::~DxvkDevice() { - TRACE(this); m_pipelineManager = nullptr; m_renderPassPool = nullptr; m_memory = nullptr; @@ -104,8 +101,6 @@ namespace dxvk { const Rc& commandList, const Rc& waitSync, const Rc& wakeSync) { - TRACE(this, commandList, waitSync, wakeSync); - Rc fence = new DxvkFence(m_vkd); VkCommandBuffer commandBuffer = commandList->handle(); @@ -147,7 +142,6 @@ namespace dxvk { void DxvkDevice::waitForIdle() const { - TRACE(this); if (m_vkd->vkDeviceWaitIdle(m_vkd->device()) != VK_SUCCESS) throw DxvkError("DxvkDevice::waitForIdle: Operation failed"); } diff --git a/src/dxvk/dxvk_framebuffer.cpp b/src/dxvk/dxvk_framebuffer.cpp index ea754134..b1d7a46b 100644 --- a/src/dxvk/dxvk_framebuffer.cpp +++ b/src/dxvk/dxvk_framebuffer.cpp @@ -69,7 +69,6 @@ namespace dxvk { m_renderPass (renderPass), m_renderTargets (renderTargets), m_framebufferSize (renderTargets.getImageSize()) { - TRACE(this, renderPass); auto views = renderTargets.getAttachments(); VkFramebufferCreateInfo info; @@ -89,7 +88,6 @@ namespace dxvk { DxvkFramebuffer::~DxvkFramebuffer() { - TRACE(this); m_vkd->vkDestroyFramebuffer( m_vkd->device(), m_framebuffer, nullptr); } diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp index 7991bc71..111882b2 100644 --- a/src/dxvk/dxvk_graphics.cpp +++ b/src/dxvk/dxvk_graphics.cpp @@ -47,8 +47,6 @@ namespace dxvk { const Rc& fs) : m_vkd(vkd), m_vs(vs), m_tcs(tcs), m_tes(tes), m_gs(gs), m_fs(fs) { - TRACE(this, vs, tcs, tes, gs, fs); - std::vector bindings; VkDescriptorSetLayoutCreateInfo dlayout; @@ -80,8 +78,6 @@ namespace dxvk { DxvkGraphicsPipeline::~DxvkGraphicsPipeline() { - TRACE(this); - this->destroyPipelines(); this->destroyObjects(); } diff --git a/src/dxvk/dxvk_image.cpp b/src/dxvk/dxvk_image.cpp index 0b213734..8d978065 100644 --- a/src/dxvk/dxvk_image.cpp +++ b/src/dxvk/dxvk_image.cpp @@ -16,12 +16,11 @@ namespace dxvk { const DxvkImageCreateInfo& info, VkImage image) : m_vkd(vkd), m_info(info), m_image(image) { - TRACE(this, image); + } DxvkImage::~DxvkImage() { - TRACE(this); // This is a bit of a hack to determine whether // the image is implementation-handled or not if (m_memory.memory() != VK_NULL_HANDLE) @@ -34,7 +33,6 @@ namespace dxvk { const Rc& image, const DxvkImageViewCreateInfo& info) : m_vkd(vkd), m_image(image), m_info(info) { - TRACE(this, image); VkComponentMapping componentMapping; componentMapping.r = VK_COMPONENT_SWIZZLE_IDENTITY; componentMapping.g = VK_COMPONENT_SWIZZLE_IDENTITY; @@ -64,7 +62,6 @@ namespace dxvk { DxvkImageView::~DxvkImageView() { - TRACE(this); m_vkd->vkDestroyImageView( m_vkd->device(), m_view, nullptr); } diff --git a/src/dxvk/dxvk_instance.cpp b/src/dxvk/dxvk_instance.cpp index 9e7e3064..66416999 100644 --- a/src/dxvk/dxvk_instance.cpp +++ b/src/dxvk/dxvk_instance.cpp @@ -5,12 +5,11 @@ namespace dxvk { DxvkInstance::DxvkInstance() : m_vkl(new vk::LibraryFn()), m_vki(new vk::InstanceFn(this->createInstance())) { - TRACE(this); + } DxvkInstance::~DxvkInstance() { - TRACE(this); m_vki->vkDestroyInstance( m_vki->instance(), nullptr); } diff --git a/src/dxvk/dxvk_memory.cpp b/src/dxvk/dxvk_memory.cpp index 306c6a87..75c9971e 100644 --- a/src/dxvk/dxvk_memory.cpp +++ b/src/dxvk/dxvk_memory.cpp @@ -90,8 +90,6 @@ namespace dxvk { VkDeviceMemory DxvkMemoryAllocator::allocMemory( VkDeviceSize blockSize, uint32_t memoryType) { - TRACE(blockSize, memoryType); - VkMemoryAllocateInfo info; info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; info.pNext = nullptr; diff --git a/src/dxvk/dxvk_pipemgr.cpp b/src/dxvk/dxvk_pipemgr.cpp index 6f6410dc..24b95c8d 100644 --- a/src/dxvk/dxvk_pipemgr.cpp +++ b/src/dxvk/dxvk_pipemgr.cpp @@ -5,12 +5,12 @@ namespace dxvk { DxvkPipelineManager::DxvkPipelineManager( const Rc& vkd) : m_vkd(vkd) { - TRACE(this); + } DxvkPipelineManager::~DxvkPipelineManager() { - TRACE(this); + } diff --git a/src/dxvk/dxvk_renderpass.cpp b/src/dxvk/dxvk_renderpass.cpp index 54bbec4d..13a31248 100644 --- a/src/dxvk/dxvk_renderpass.cpp +++ b/src/dxvk/dxvk_renderpass.cpp @@ -44,7 +44,6 @@ namespace dxvk { VkImageLayout initialLayout, VkImageLayout finalLayout) : m_vkd(vkd), m_format(fmt) { - TRACE(this, initialLayout, finalLayout); std::vector attachments; VkAttachmentReference depthRef; @@ -128,7 +127,6 @@ namespace dxvk { DxvkRenderPass::~DxvkRenderPass() { - TRACE(this); m_vkd->vkDestroyRenderPass( m_vkd->device(), m_renderPass, nullptr); } @@ -136,12 +134,12 @@ namespace dxvk { DxvkRenderPassPool::DxvkRenderPassPool(const Rc& vkd) : m_vkd(vkd) { - TRACE(this); + } DxvkRenderPassPool::~DxvkRenderPassPool() { - TRACE(this); + } diff --git a/src/dxvk/dxvk_shader.cpp b/src/dxvk/dxvk_shader.cpp index 2053b6de..b52cbc92 100644 --- a/src/dxvk/dxvk_shader.cpp +++ b/src/dxvk/dxvk_shader.cpp @@ -7,8 +7,6 @@ namespace dxvk { VkShaderStageFlagBits stage, const SpirvCodeBuffer& code) : m_vkd(vkd), m_stage(stage) { - TRACE(this, stage); - VkShaderModuleCreateInfo info; info.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; info.pNext = nullptr; @@ -23,8 +21,6 @@ namespace dxvk { DxvkShader::~DxvkShader() { - TRACE(this); - m_vkd->vkDestroyShaderModule( m_vkd->device(), m_module, nullptr); } diff --git a/src/dxvk/dxvk_surface.cpp b/src/dxvk/dxvk_surface.cpp index 13f13d51..302ca6da 100644 --- a/src/dxvk/dxvk_surface.cpp +++ b/src/dxvk/dxvk_surface.cpp @@ -13,12 +13,11 @@ namespace dxvk { m_handle (createSurface(instance, window)), m_surfaceFormats (getSurfaceFormats()), m_presentModes (getPresentModes()) { - TRACE(this, adapter, instance, window); + } DxvkSurface::~DxvkSurface() { - TRACE(this); m_vki->vkDestroySurfaceKHR( m_vki->instance(), m_handle, nullptr); } diff --git a/src/dxvk/dxvk_swapchain.cpp b/src/dxvk/dxvk_swapchain.cpp index 028048a8..f55e39b8 100644 --- a/src/dxvk/dxvk_swapchain.cpp +++ b/src/dxvk/dxvk_swapchain.cpp @@ -17,13 +17,11 @@ namespace dxvk { m_surface (surface), m_queue (queue), m_properties(properties) { - TRACE(this, device, surface, queue); this->recreateSwapchain(); } DxvkSwapchain::~DxvkSwapchain() { - TRACE(this); m_device->waitForIdle(); m_vkd->vkDestroySwapchainKHR( m_vkd->device(), m_handle, nullptr); @@ -32,8 +30,6 @@ namespace dxvk { Rc DxvkSwapchain::getFramebuffer( const Rc& wakeSync) { - TRACE(this, wakeSync); - VkResult status = this->acquireNextImage(wakeSync); if (status == VK_ERROR_OUT_OF_DATE_KHR) { @@ -50,8 +46,6 @@ namespace dxvk { void DxvkSwapchain::present(const Rc& waitSync) { - TRACE(this, waitSync); - const VkSemaphore waitSemaphore = waitSync->handle(); VkPresentInfoKHR info; @@ -75,7 +69,6 @@ namespace dxvk { void DxvkSwapchain::changeProperties( const DxvkSwapchainProperties& props) { - TRACE(this); m_properties = props; this->recreateSwapchain(); } @@ -93,7 +86,6 @@ namespace dxvk { void DxvkSwapchain::recreateSwapchain() { - TRACE(this); VkSwapchainKHR oldSwapchain = m_handle; // Wait until we can be certain that none of our diff --git a/src/dxvk/dxvk_sync.cpp b/src/dxvk/dxvk_sync.cpp index dc6ba44a..aabf32a7 100644 --- a/src/dxvk/dxvk_sync.cpp +++ b/src/dxvk/dxvk_sync.cpp @@ -5,8 +5,6 @@ namespace dxvk { DxvkSemaphore::DxvkSemaphore( const Rc& vkd) : m_vkd(vkd) { - TRACE(this); - VkSemaphoreCreateInfo info; info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; info.pNext = nullptr; @@ -18,7 +16,6 @@ namespace dxvk { DxvkSemaphore::~DxvkSemaphore() { - TRACE(this); m_vkd->vkDestroySemaphore( m_vkd->device(), m_semaphore, nullptr); } @@ -26,8 +23,6 @@ namespace dxvk { DxvkFence::DxvkFence(const Rc& vkd) : m_vkd(vkd) { - TRACE(this); - VkFenceCreateInfo info; info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; info.pNext = nullptr; @@ -39,15 +34,12 @@ namespace dxvk { DxvkFence::~DxvkFence() { - TRACE(this); m_vkd->vkDestroyFence( m_vkd->device(), m_fence, nullptr); } bool DxvkFence::wait(uint64_t timeout) const { - TRACE(this, timeout); - VkResult status = m_vkd->vkWaitForFences( m_vkd->device(), 1, &m_fence, VK_FALSE, timeout); @@ -58,7 +50,6 @@ namespace dxvk { void DxvkFence::reset() { - TRACE(this); if (m_vkd->vkResetFences(m_vkd->device(), 1, &m_fence) != VK_SUCCESS) throw DxvkError("DxvkFence::reset: Failed to reset fence"); }