From 3375cdf1fac066904dab3ee3ba1248b0292fe339 Mon Sep 17 00:00:00 2001
From: Joshua Ashton <joshua@froggi.es>
Date: Fri, 6 Jan 2023 14:32:33 +0000
Subject: [PATCH] [dxgi] Initialize DxgiOptions before DxgiMonitorInfo

Needed to we can access DxgiOptions inside of DxgiMonitorInfo for the dxgi.enableHDR property coming up in a future commit.
---
 src/dxgi/dxgi_factory.cpp | 2 +-
 src/dxgi/dxgi_factory.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dxgi/dxgi_factory.cpp b/src/dxgi/dxgi_factory.cpp
index 10cf2861d..c7f3c302d 100644
--- a/src/dxgi/dxgi_factory.cpp
+++ b/src/dxgi/dxgi_factory.cpp
@@ -7,8 +7,8 @@ namespace dxvk {
 
   DxgiFactory::DxgiFactory(UINT Flags)
   : m_instance    (new DxvkInstance()),
-    m_monitorInfo (this),
     m_options     (m_instance->config()),
+    m_monitorInfo (this),
     m_flags       (Flags) {
     for (uint32_t i = 0; m_instance->enumAdapters(i) != nullptr; i++)
       m_instance->enumAdapters(i)->logAdapterInfo();
diff --git a/src/dxgi/dxgi_factory.h b/src/dxgi/dxgi_factory.h
index f398c78d9..4d75c277f 100644
--- a/src/dxgi/dxgi_factory.h
+++ b/src/dxgi/dxgi_factory.h
@@ -146,8 +146,8 @@ namespace dxvk {
   private:
     
     Rc<DxvkInstance> m_instance;
-    DxgiMonitorInfo  m_monitorInfo;
     DxgiOptions      m_options;
+    DxgiMonitorInfo  m_monitorInfo;
     UINT             m_flags;
     
     HWND m_associatedWindow = nullptr;