bfi/alpha2

Author: mausimus

ShaderGlass/CaptureManager.cpp

@@ -386,6 +386,9 @@ void CaptureManager::Exit()
         m_shaderGlass->Stop();
         delete m_shaderGlass.release();
 
+        m_renderContext->ClearState();
+        m_renderContext->Flush();
+
         if(m_debug)
         {
             m_debug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL | D3D11_RLDO_IGNORE_INTERNAL);
@@ -629,6 +632,8 @@ void CaptureManager::SetGraphicsAdapters(int captureNo, int renderNo, LUID& capt
     m_defaultAdapter = (captureNo == 0 && renderNo == 0);
     m_captureDevice  = nullptr;
     m_renderDevice   = nullptr;
+
+    Sleep(1000);
     if(active)
         StartSession();
 }

ShaderGlass/CaptureSession.cpp

@@ -37,7 +37,8 @@ CaptureSession::CaptureSession(winrt::com_ptr<ID3D11Device>      captureDevice,
     m_device        = CreateDirect3DDevice(dxgiDevice.get());
 
     m_contentSize = m_item.Size();
-    m_framePool   = winrt::Direct3D11CaptureFramePool::CreateFreeThreaded(m_device, pixelFormat, 2, m_contentSize);
+    //m_framePool   = winrt::Direct3D11CaptureFramePool::CreateFreeThreaded(m_device, pixelFormat, 2, m_contentSize);
+    m_framePool = winrt::Direct3D11CaptureFramePool::Create(m_device, pixelFormat, 2, m_contentSize);
     m_session     = m_framePool.CreateCaptureSession(m_item);
 
     // try to disable yellow border
@@ -56,15 +57,15 @@ CaptureSession::CaptureSession(winrt::com_ptr<ID3D11Device>      captureDevice,
         try
         {
             // max 250Hz?
-            const auto minInterval = maxCaptureRate ? std::chrono::milliseconds(4) : std::chrono::milliseconds(15);
+            const auto minInterval = maxCaptureRate ? std::chrono::milliseconds(1) : std::chrono::milliseconds(15);
             m_session.MinUpdateInterval(winrt::Windows::Foundation::TimeSpan(minInterval));
         }
         catch(...)
         { }
     }
 
     Reset();
-    m_framePool.FrameArrived({this, &CaptureSession::OnFrameArrived});
+    //m_framePool.FrameArrived({this, &CaptureSession::OnFrameArrived});
     m_session.StartCapture();
 
     WINRT_ASSERT(m_session != nullptr);
@@ -97,6 +98,8 @@ void CaptureSession::OnFrameArrived(winrt::Direct3D11CaptureFramePool const& sen
         return;
 
     auto frame      = sender.TryGetNextFrame();
+    if(!frame)
+        return;
     auto inputFrame = GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame.Surface());
 
     auto contentSize = frame.ContentSize();
@@ -111,7 +114,7 @@ void CaptureSession::OnFrameArrived(winrt::Direct3D11CaptureFramePool const& sen
 
     m_textureBridge.PutInputFrame(inputFrame, resized);
 
-    SetEvent(m_frameEvent);
+    //SetEvent(m_frameEvent);
     OnInputFrame();
 }
 
@@ -137,6 +140,7 @@ void CaptureSession::ProcessInput()
     }
     else
     {
+        OnFrameArrived(m_framePool, nullptr);
         m_shaderGlass.Process(m_textureBridge.GetInputFrame(), m_frameTicks, m_numInputFrames);
     }
 }

ShaderGlass/ShaderGlass.cpp

@@ -12,7 +12,7 @@ GNU General Public License v3.0
 #include "Helpers.h"
 #include "resource.h"
 
-#define TIMING_DUMP
+//#define TIMING_DUMP
 
 static HRESULT     hr;
 static const float background_colour[4] = {0, 0, 0, 1.0f};
@@ -31,7 +31,9 @@ ShaderGlass::~ShaderGlass()
     DestroyPasses();
     DestroyTargets();
 
+    m_context->ClearState();
     m_context->Flush();
+    m_context = nullptr;
 }
 
 void ShaderGlass::Initialize(HWND                                outputWindow,

ShaderGlass/ShaderGlass.rc

@@ -1328,7 +1328,7 @@ void ShaderWindow::UpdateTitle()
             snprintf(inFPSdisplay, 20, "%d->", inFPS);
         _snwprintf_s(title,
                      200,
-                     _T("ShaderGlass (%s%S, %Spx, %S%%, ~%S, %S%dfps%S)"),
+                     _T("ShaderGlass/BFI (%s%S, %Spx, %S%%, ~%S, %S%dfps%S)"),
                      windowName,
                      shader->Name.c_str(),
                      pixelSize.mnemonic,
@@ -1341,7 +1341,7 @@ void ShaderWindow::UpdateTitle()
     }
     else
     {
-        SetWindowTextW(m_mainWindow, _T("ShaderGlass (stopped)"));
+        SetWindowTextW(m_mainWindow, _T("ShaderGlass/BFI (stopped)"));
     }
 }
 
@@ -2063,8 +2063,8 @@ LRESULT CALLBACK ShaderWindow::WndProc(HWND hWnd, UINT message, WPARAM wParam, L
                     auto captureNo = (wmId - WM_GPU(0, 0)) / MAX_GPU;
                     auto renderNo  = (wmId - WM_GPU(0, 0)) % MAX_GPU;
                     LUID captureId, renderId;
-                    m_captureManager.SetGraphicsAdapters(captureNo, renderNo, captureId, renderId);
                     SaveGPUs(captureId, renderId);
+                    m_captureManager.SetGraphicsAdapters(captureNo, renderNo, captureId, renderId);
                     UpdateGPUName();
                 }
             }
@@ -2634,7 +2634,7 @@ void ShaderWindow::SaveMaxCaptureRateState(bool state)
 
 bool ShaderWindow::GetMaxCaptureRateState()
 {
-    return GetRegistryOption(TEXT("Max Capture Rate"), false);
+    return GetRegistryOption(TEXT("Max Capture Rate"), true);
 }
 
 void ShaderWindow::SaveUseHDRState(bool state)