Merge branch 'master' into idd-no-gpu-warn

idd/LGCommon/PipeMsg.h

@@ -30,7 +30,8 @@ struct LGPipeMsg
   enum
   {
     SETCURSORPOS,
-    SETDISPLAYMODE
+    SETDISPLAYMODE,
+    GPUSTATUS
   }
   type;
   union
@@ -49,5 +50,11 @@ struct LGPipeMsg
       uint32_t refresh;
     }
     displayMode;
+
+    struct
+    {
+      bool software;
+    }
+    gpuStatus;
   };
 };

idd/LGIdd/CD3D11Device.cpp

@@ -30,6 +30,13 @@ HRESULT CD3D11Device::Init()
   hr = m_factory->EnumAdapterByLuid(m_adapterLuid, IID_PPV_ARGS(&m_adapter));
   if (FAILED(hr))
     return hr;
+
+  DXGI_ADAPTER_DESC1 desc = {};
+  hr = m_adapter->GetDesc1(&desc);
+  if (FAILED(hr))
+    return hr;
+
+  m_isSoftware = (desc.Flags & DXGI_ADAPTER_FLAG_SOFTWARE) != 0;
   
   // only 11.1 supports DX12 interoperabillity
   static const D3D_FEATURE_LEVEL featureLevels[] =

idd/LGIdd/CD3D11Device.h

@@ -36,6 +36,7 @@ private:
   ComPtr<IDXGIAdapter1       > m_adapter;
   ComPtr<ID3D11Device5       > m_device;
   ComPtr<ID3D11DeviceContext4> m_context;
+  bool m_isSoftware;
 
 public:
   CD3D11Device(LUID adapterLuid) :
@@ -51,4 +52,6 @@ public:
   ComPtr<ID3D11Device5> GetDevice() { return m_device; }
 
   ComPtr<ID3D11DeviceContext4> GetContext() { return m_context; }
+
+  bool IsSoftware() { return m_isSoftware; }
 };

idd/LGIdd/CIndirectMonitorContext.cpp

@@ -21,6 +21,7 @@
 #include "CIndirectMonitorContext.h"
 #include "CPlatformInfo.h"
 #include "CDebug.h"
+#include "CPipeServer.h"
 
 CIndirectMonitorContext::CIndirectMonitorContext(_In_ IDDCX_MONITOR monitor, CIndirectDeviceContext * device) :
   m_monitor(monitor),
@@ -70,6 +71,7 @@ reInit:
   }
 
   m_swapChain.reset(new CSwapChainProcessor(m_monitor, m_devContext, swapChain, m_dx11Device, m_dx12Device, newFrameEvent));
+  g_pipe.SetGPUStatus(m_dx11Device->IsSoftware());
 }
 
 void CIndirectMonitorContext::UnassignSwapChain()

idd/LGIdd/CPipeServer.cpp

@@ -174,4 +174,16 @@ void CPipeServer::SetDisplayMode(uint32_t width, uint32_t height, uint32_t refre
   msg.displayMode.height  = height;
   msg.displayMode.refresh = refresh;
   WriteMsg(msg);
+}
+
+void CPipeServer::SetGPUStatus(bool software)
+{
+  if (!m_connected)
+    return;
+
+  LGPipeMsg msg;
+  msg.size               = sizeof(msg);
+  msg.type               = LGPipeMsg::GPUSTATUS;
+  msg.gpuStatus.software = software;
+  WriteMsg(msg);
 }

idd/LGIdd/CPipeServer.h

@@ -55,6 +55,7 @@ class CPipeServer
 
     void SetCursorPos(uint32_t x, uint32_t y);
     void SetDisplayMode(uint32_t width, uint32_t height, uint32_t refresh);
+    void SetGPUStatus(bool software);
 };
 
 extern CPipeServer g_pipe;

idd/LGIddHelper/CConfigWindow.cpp

@@ -90,7 +90,7 @@ void CConfigWindow::updateFont()
 
   for (HWND child : std::initializer_list<HWND>({
     *m_version, *m_modeGroup, *m_modeBox, *m_widthLabel, *m_heightLabel, *m_refreshLabel,
-    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate, *m_modeDelete,
+    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate, *m_modeDelete, *m_modeReset,
     *m_autosizeGroup, *m_defRefreshLabel, *m_defRefresh, *m_defRefreshHz,
     *m_prefGroup, *m_prefNoGPU,
   }))
@@ -157,6 +157,7 @@ LRESULT CConfigWindow::onCreate()
 
   m_modeUpdate.reset(new CButton(L"Save", WS_CHILD | WS_VISIBLE | WS_TABSTOP, m_hwnd));
   m_modeDelete.reset(new CButton(L"Delete", WS_CHILD | WS_VISIBLE | WS_TABSTOP, m_hwnd));
+  m_modeReset.reset(new CButton(L"Reset", WS_CHILD | WS_VISIBLE | WS_TABSTOP, m_hwnd));
   EnableWindow(*m_modeUpdate, FALSE);
   EnableWindow(*m_modeDelete, FALSE);
 
@@ -207,6 +208,7 @@ LRESULT CConfigWindow::onResize(DWORD width, DWORD height)
   pos.pinBottomLeft(*m_modeRefresh, 75, 48, 50, 20);
   pos.pinBottomLeft(*m_modeUpdate, 24, 20, 50, 24);
   pos.pinBottomLeft(*m_modeDelete, 75, 20, 50, 24);
+  pos.pinBottomLeft(*m_modeReset, 126, 20, 50, 24);
 
   pos.pinTopLeft(*m_autosizeGroup, 224, 40, 200, 52);
   pos.pinTopLeft(*m_defRefreshLabel, 236, 64, 95, 20);
@@ -293,6 +295,14 @@ LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
     updateModeList();
     onModeListSelectChange();
   }
+  else if (m_modeReset && hwnd == *m_modeReset && code == BN_CLICKED && m_modes)
+  {
+    *m_modes = m_settings.getDefaultModes();
+    m_settings.setModes(*m_modes);
+    m_modeBox->clear();
+    updateModeList();
+    onModeListSelectChange();
+  }
   else if (m_defRefresh && hwnd == *m_defRefresh && code == EN_CHANGE && m_defaultRefresh)
   {
     int value;

idd/LGIddHelper/CConfigWindow.h

@@ -52,6 +52,7 @@ class CConfigWindow : public CWindow
 
   std::unique_ptr<CButton> m_modeUpdate;
   std::unique_ptr<CButton> m_modeDelete;
+  std::unique_ptr<CButton> m_modeReset;
 
   std::unique_ptr<CGroupBox> m_autosizeGroup;
   std::unique_ptr<CStaticWidget> m_defRefreshLabel;

idd/LGIddHelper/CPipeClient.cpp

@@ -264,6 +264,10 @@ void CPipeClient::Thread()
           HandleSetDisplayMode(msg);
           break;
 
+        case LGPipeMsg::GPUSTATUS:
+          HandleGPUStatus(msg);
+          break;
+
         default:
           DEBUG_ERROR("Unknown message type %d", msg.type);
           break;
@@ -300,3 +304,8 @@ void CPipeClient::HandleSetDisplayMode(const LGPipeMsg& msg)
   if (result != DISP_CHANGE_SUCCESSFUL)
     DEBUG_ERROR("ChangeDisplaySettingsEx Failed (0x%08x)", result);
 }
+
+void CPipeClient::HandleGPUStatus(const LGPipeMsg& msg)
+{
+  // TODO: implement me
+}

idd/LGIddHelper/CPipeClient.h

@@ -49,6 +49,7 @@ private:
   
   void HandleSetCursorPos(const LGPipeMsg& msg);
   void HandleSetDisplayMode(const LGPipeMsg& msg);
+  void HandleGPUStatus(const LGPipeMsg& msg);
 
 public:
   ~CPipeClient() { DeInit(); }

idd/LGIddHelper/CRegistrySettings.cpp

@@ -78,6 +78,24 @@ static std::optional<DisplayMode> parseDisplayMode(const std::wstring &str)
   return mode;
 }
 
+std::vector<DisplayMode> CRegistrySettings::getDefaultModes()
+{
+  auto defaultRefresh = getDefaultRefresh();
+  int refresh = defaultRefresh ? *defaultRefresh : DEFAULT_REFRESH;
+
+  std::vector<DisplayMode> result;
+  for (int i = 0; i < ARRAYSIZE(DefaultDisplayModes); ++i)
+  {
+    DisplayMode mode;
+    mode.width = DefaultDisplayModes[i][0];
+    mode.height = DefaultDisplayModes[i][1];
+    mode.refresh = refresh;
+    mode.preferred = i == DefaultPreferredDisplayMode;
+    result.emplace_back(mode);
+  }
+  return result;
+}
+
 std::optional<std::vector<DisplayMode>> CRegistrySettings::getModes()
 {
   LSTATUS status;
@@ -89,19 +107,7 @@ std::optional<std::vector<DisplayMode>> CRegistrySettings::getModes()
   case ERROR_SUCCESS:
     break;
   case ERROR_FILE_NOT_FOUND:
-  {
+    return getDefaultModes();
-    std::vector<DisplayMode> result;
-    for (int i = 0; i < ARRAYSIZE(DefaultDisplayModes); ++i)
-    {
-      DisplayMode mode;
-      mode.width = DefaultDisplayModes[i][0];
-      mode.height = DefaultDisplayModes[i][1];
-      mode.refresh = DefaultDisplayModes[i][2];
-      mode.preferred = i == DefaultPreferredDisplayMode;
-      result.emplace_back(mode);
-    }
-    return result;
-  }
   default:
     DEBUG_ERROR_HR(status, "RegGetValue(Modes) length computation");
     return {};

idd/LGIddHelper/CRegistrySettings.h

@@ -44,6 +44,7 @@ public:
   LSTATUS open();
   bool isOpen() { return !!hKey; }
 
+  std::vector<DisplayMode> getDefaultModes();
   std::optional<std::vector<DisplayMode>> getModes();
   LSTATUS setModes(const std::vector<DisplayMode> &modes);