Merge branch 'master' of https://github.com/doitsujin/dxvk

src/d3d11/d3d11_cmdlist.cpp

@@ -52,7 +52,7 @@ namespace dxvk {
   void D3D11CommandList::EmitToCommandList(ID3D11CommandList* pCommandList) {
     auto cmdList = static_cast<D3D11CommandList*>(pCommandList);
     
-    for (auto chunk : m_chunks)
+    for (const auto& chunk : m_chunks)
       cmdList->m_chunks.push_back(chunk);
     
     cmdList->m_drawCount += m_drawCount;
@@ -60,7 +60,7 @@ namespace dxvk {
   
   
   void D3D11CommandList::EmitToCsThread(DxvkCsThread* CsThread) {
-    for (auto chunk : m_chunks)
+    for (const auto& chunk : m_chunks)
       CsThread->dispatchChunk(Rc<DxvkCsChunk>(chunk));
   }
   

src/d3d11/d3d11_context.cpp

@@ -2604,7 +2604,7 @@ namespace dxvk {
     }
     
     // Create and bind the framebuffer object to the context
-    EmitCs([cAttachments = std::move(attachments)] (DxvkContext* ctx) {
+    EmitCs([cAttachments = attachments] (DxvkContext* ctx) {
       ctx->bindRenderTargets(cAttachments);
     });
   }

src/d3d11/d3d11_device.cpp

@@ -1032,7 +1032,7 @@ namespace dxvk {
       return S_FALSE;
     
     *ppVertexShader = ref(new D3D11VertexShader(
-      this, std::move(module)));
+      this, module));
     return S_OK;
   }
   
@@ -1054,7 +1054,7 @@ namespace dxvk {
       return S_FALSE;
     
     *ppGeometryShader = ref(new D3D11GeometryShader(
-      this, std::move(module)));
+      this, module));
     return S_OK;
   }
   
@@ -1092,7 +1092,7 @@ namespace dxvk {
       return S_FALSE;
     
     *ppPixelShader = ref(new D3D11PixelShader(
-      this, std::move(module)));
+      this, module));
     return S_OK;
   }
   
@@ -1114,7 +1114,7 @@ namespace dxvk {
       return S_FALSE;
     
     *ppHullShader = ref(new D3D11HullShader(
-      this, std::move(module)));
+      this, module));
     return S_OK;
   }
   
@@ -1136,7 +1136,7 @@ namespace dxvk {
       return S_FALSE;
     
     *ppDomainShader = ref(new D3D11DomainShader(
-      this, std::move(module)));
+      this, module));
     return S_OK;
   }
   
@@ -1158,7 +1158,7 @@ namespace dxvk {
       return S_FALSE;
     
     *ppComputeShader = ref(new D3D11ComputeShader(
-      this, std::move(module)));
+      this, module));
     return S_OK;
   }
   

src/d3d11/d3d11_shader.h

@@ -104,7 +104,7 @@ namespace dxvk {
   public:
     
     D3D11Shader(D3D11Device* device, const D3D11ShaderModule& module)
-    : m_device(device), m_module(std::move(module)) { }
+    : m_device(device), m_module(module) { }
     
     ~D3D11Shader() { }
     

src/dxvk/hud/dxvk_hud_stats.cpp

@@ -47,7 +47,7 @@ namespace dxvk::hud {
     const Rc<DxvkContext>&  context,
           HudRenderer&      renderer,
           HudPos            position) {
-    const uint64_t frameCount = std::max(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1ull);
+    const uint64_t frameCount = std::max<uint64_t>(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1);
     
     const uint64_t gpCalls = m_diffCounters.getCtr(DxvkStatCounter::CmdDrawCalls)       / frameCount;
     const uint64_t cpCalls = m_diffCounters.getCtr(DxvkStatCounter::CmdDispatchCalls)   / frameCount;
@@ -80,7 +80,7 @@ namespace dxvk::hud {
     const Rc<DxvkContext>&  context,
           HudRenderer&      renderer,
           HudPos            position) {
-    const uint64_t frameCount = std::max(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1ull);
+    const uint64_t frameCount = std::max<uint64_t>(m_diffCounters.getCtr(DxvkStatCounter::QueuePresentCount), 1);
     const uint64_t numSubmits = m_diffCounters.getCtr(DxvkStatCounter::QueueSubmitCount) / frameCount;
     
     const std::string strSubmissions = str::format("Queue submissions: ", numSubmits);
@@ -152,4 +152,4 @@ namespace dxvk::hud {
       HudElement::StatMemory);
   }
   
-}
+}