diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 27d43a24..08f992b5 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -890,7 +890,7 @@ namespace dxvk { } - void D3D11ImmediateContext::EmitCsChunkExternal( + void D3D11ImmediateContext::InjectCsChunk( DxvkCsChunkRef&& Chunk, bool Synchronize) { // Do not update the sequence number when emitting a chunk diff --git a/src/d3d11/d3d11_context_imm.h b/src/d3d11/d3d11_context_imm.h index 3c867fa2..e9f1d7bd 100644 --- a/src/d3d11/d3d11_context_imm.h +++ b/src/d3d11/d3d11_context_imm.h @@ -97,17 +97,17 @@ namespace dxvk { return m_multithread.AcquireLock(); } - void EmitCsChunkExternal( + void InjectCsChunk( DxvkCsChunkRef&& Chunk, bool Synchronize); template - void InjectCsCommand( + void InjectCs( Fn&& Command) { auto chunk = AllocCsChunk(); chunk->push(std::move(Command)); - EmitCsChunkExternal(std::move(chunk), false); + InjectCsChunk(std::move(chunk), false); } private: diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp index 05895ab6..f9cc0647 100644 --- a/src/d3d11/d3d11_device.cpp +++ b/src/d3d11/d3d11_device.cpp @@ -2778,7 +2778,7 @@ namespace dxvk { feedback = ctx->ensureImageCompatibility(cImage, usageInfo); }); - m_device->GetContext()->EmitCsChunkExternal(std::move(chunk), true); + m_device->GetContext()->InjectCsChunk(std::move(chunk), true); if (!feedback) { Logger::err(str::format("Failed to lock image:" @@ -2802,7 +2802,7 @@ namespace dxvk { ctx->ensureBufferAddress(cBuffer); }); - m_device->GetContext()->EmitCsChunkExternal(std::move(chunk), true); + m_device->GetContext()->InjectCsChunk(std::move(chunk), true); } diff --git a/src/d3d11/d3d11_swapchain.cpp b/src/d3d11/d3d11_swapchain.cpp index 51651d45..9aeff932 100644 --- a/src/d3d11/d3d11_swapchain.cpp +++ b/src/d3d11/d3d11_swapchain.cpp @@ -613,7 +613,7 @@ namespace dxvk { // Initialize the image so that we can use it. Clearing // to black prevents garbled output for the first frame. - m_parent->GetContext()->InjectCsCommand([ + m_parent->GetContext()->InjectCs([ cSwapImage = m_swapImage ] (DxvkContext* ctx) { ctx->initImage(cSwapImage,