[hud] Respect dxvk.hud configuration option again

This was accidentally dropped during the HUD refactor. Fixes #1279.
doitsujin · Dec 17, 2019 · a265af7 · a265af7
1 parent e527b96
commit a265af7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/dxvk/hud/dxvk_hud.cpp b/src/dxvk/hud/dxvk_hud.cpp
@@ -7,7 +7,8 @@ namespace dxvk::hud {
   Hud::Hud(
     const Rc<DxvkDevice>& device)
   : m_device        (device),
-    m_renderer      (device) {
+    m_renderer      (device),
+    m_hudItems      (device) {
     // Set up constant state
     m_rsState.polygonMode       = VK_POLYGON_MODE_FILL;
     m_rsState.cullMode          = VK_CULL_MODE_BACK_BIT;

diff --git a/src/dxvk/hud/dxvk_hud_item.cpp b/src/dxvk/hud/dxvk_hud_item.cpp
@@ -15,9 +15,12 @@ namespace dxvk::hud {
   }
 
 
-  HudItemSet::HudItemSet() {
+  HudItemSet::HudItemSet(const Rc<DxvkDevice>& device) {
     std::string configStr = env::getEnvVar("DXVK_HUD");
 
+    if (configStr.empty())
+      configStr = device->config().hud;
+
     if (configStr == "full") {
       // Just enable everything
       m_enableFull = true;

diff --git a/src/dxvk/hud/dxvk_hud_item.h b/src/dxvk/hud/dxvk_hud_item.h
@@ -52,7 +52,7 @@ namespace dxvk::hud {
 
   public:
 
-    HudItemSet();
+    HudItemSet(const Rc<DxvkDevice>& device);
 
     ~HudItemSet();
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ namespace dxvk::hud { @@
       public:
-        HudItemSet();
+        HudItemSet(const Rc<DxvkDevice>& device);
         ~HudItemSet();
@@ Expand Down @@