From c934d85b859eab9f131d33f9fc73d7f2f49acdfe Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Sun, 15 Jul 2018 19:45:40 +0200 Subject: [PATCH] [d3d11] Move D3D11ImmediateContext constexpr values to .cpp file In my winelib builds, I get unresolved dxvk::D3D11ImmediateContext::MinFlushIntervalUs symbol. I'm not sure why it doesn't inline this constexpr, but it doesn't seem useful to expose that in header anyway. --- src/d3d11/d3d11_context_imm.cpp | 5 ++++- src/d3d11/d3d11_context_imm.h | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 443e9e93..711a0f84 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -3,6 +3,9 @@ #include "d3d11_device.h" #include "d3d11_texture.h" +constexpr static uint32_t MinFlushIntervalUs = 1250; +constexpr static uint32_t MaxPendingSubmits = 3; + namespace dxvk { D3D11ImmediateContext::D3D11ImmediateContext( @@ -552,4 +555,4 @@ namespace dxvk { } } -} \ No newline at end of file +} diff --git a/src/d3d11/d3d11_context_imm.h b/src/d3d11/d3d11_context_imm.h index 7a6c69e2..720c8397 100644 --- a/src/d3d11/d3d11_context_imm.h +++ b/src/d3d11/d3d11_context_imm.h @@ -10,8 +10,6 @@ namespace dxvk { class D3D11CommonTexture; class D3D11ImmediateContext : public D3D11DeviceContext { - constexpr static uint32_t MinFlushIntervalUs = 1250; - constexpr static uint32_t MaxPendingSubmits = 3; public: D3D11ImmediateContext( @@ -159,4 +157,4 @@ namespace dxvk { }; -} \ No newline at end of file +}