Merge branch 'master' into feature/additional-weapon-customization

Author: DeValdi

Client/cefweb/CWebApp.cpp

@@ -57,8 +57,7 @@ namespace
         // Prevent Chromium from dropping privileges; required for elevated launches (see chromium/3960)
         commandLine->AppendSwitch("do-not-de-elevate");
 
-        // Must apply essential CEF switches regardless of WebCore availability
-        commandLine->AppendSwitch("disable-gpu-compositing");
+        // Enable external begin frame scheduling for MTA-controlled rendering
         commandLine->AppendSwitch("enable-begin-frame-scheduling");
         // Explicitly block account sign-in to avoid crashes when Google API keys are registered on the system
         commandLine->AppendSwitchWithValue("allow-browser-signin", "false");
@@ -71,6 +70,7 @@ namespace
         }
 
         bool disableGpu = false;
+        bool enableVideoAccel = true;
         if (g_pCore && IsReadablePointer(g_pCore, sizeof(void*)))
         {
             auto* cvars = g_pCore->GetCVars();
@@ -79,6 +79,8 @@ namespace
                 bool gpuEnabled = true;
                 cvars->Get("browser_enable_gpu", gpuEnabled);
                 disableGpu = !gpuEnabled;
+
+                cvars->Get("browser_enable_video_acceleration", enableVideoAccel);
             }
         }
 
@@ -92,13 +94,22 @@ namespace
             else
             {
                 // In Wine, we generally want to try GPU (DXVK handles it well)
-                // But disable-gpu-compositing is already set above which is key
                 // If user hasn't explicitly disabled GPU in cvars, let it run
             }
         }
 
         if (disableGpu)
+        {
             commandLine->AppendSwitch("disable-gpu");
+            // Also disable GPU compositing when GPU is disabled
+            commandLine->AppendSwitch("disable-gpu-compositing");
+        }
+
+        // Hardware video decoding - enable when GPU is enabled and video acceleration is requested
+        if (!disableGpu && enableVideoAccel)
+        {
+            commandLine->AppendSwitch("enable-accelerated-video-decode");
+        }
     }
 }  // namespace
 

Client/cefweb/CWebCore.cpp

@@ -440,7 +440,20 @@ void CWebCore::DoEventQueuePulse()
         event.callback();
     }
 
-    // Invoke paint method if necessary on the main thread
+    // Request new frames from CEF using external begin frame scheduling
+    // This synchronizes CEF rendering with MTA's render loop, eliminating
+    // the previous 250ms blocking wait in OnPaint
+    for (auto& view : m_WebViews)
+    {
+        if (view->IsBeingDestroyed() || view->GetRenderingPaused())
+            continue;
+
+        auto browser = view->GetCefBrowser();
+        if (browser)
+            browser->GetHost()->SendExternalBeginFrame();
+    }
+
+    // Copy rendered data to D3D textures on the main thread
     for (auto& view : m_WebViews)
     {
         view->UpdateTexture();

Client/cefweb/CWebView.cpp

@@ -24,12 +24,12 @@
 #include <cef3/cef/include/cef_values.h>
 #include <SString.h>
 #include <audiopolicy.h>
-#include <condition_variable>
 #include <functional>
 #include <memory>
 #include <mmdeviceapi.h>
 #include <mutex>
 #include <cstdint>
+#include <chrono>
 #define GetNextSibling(hwnd) GetWindow(hwnd, GW_HWNDNEXT)  // Re-define the conflicting macro
 #define GetFirstChild(hwnd)  GetTopWindow(hwnd)
 
@@ -43,12 +43,6 @@ namespace WebViewAuth
     bool HandleInputFocus(CWebView*, CefRefPtr<CefListValue>, const bool);
 }
 
-enum class ECefThreadState
-{
-    Running = 0,  // CEF thread is currently running
-    Wait          // CEF thread is waiting for the main thread
-};
-
 class CWebView : public CWebViewInterface,
                  private CefClient,
                  private CefRenderHandler,
@@ -71,6 +65,7 @@ class CWebView : public CWebViewInterface,
     void                  SetWebBrowserEvents(CWebBrowserEventsInterface* pInterface);
     void                  ClearWebBrowserEvents(CWebBrowserEventsInterface* pInterface);
     void                  CloseBrowser();
+    bool                  EnsureBrowserCreated();  // Lazy creation: creates browser on first use
     CefRefPtr<CefBrowser> GetCefBrowser() { return m_pWebView; };
 
     bool IsBeingDestroyed() { return m_bBeingDestroyed; }
@@ -211,7 +206,6 @@ class CWebView : public CWebViewInterface,
                                      CefRefPtr<CefMenuModel> model) override;
 
 private:
-    void ResumeCefThread();
     void QueueBrowserEvent(const char* name, std::function<void(CWebBrowserEventsInterface*)>&& fn);
 
     struct FEventTarget
@@ -270,29 +264,37 @@ class CWebView : public CWebViewInterface,
     CefRefPtr<CefBrowser> m_pWebView;
     CWebBrowserItem*      m_pWebBrowserRenderItem;
 
-    std::atomic_bool              m_bBeingDestroyed;
-    bool                          m_bIsLocal;
-    bool                          m_bIsRenderingPaused;
-    bool                          m_bIsTransparent;
-    POINT                         m_vecMousePosition;
-    bool                          m_mouseButtonStates[3];
-    SString                       m_CurrentTitle;
-    float                         m_fVolume;
-    std::map<SString, SString>    m_Properties;
-    bool                          m_bHasInputFocus;
-    std::set<std::string>         m_AjaxHandlers;
-    std::shared_ptr<FEventTarget> m_pEventTarget;
+    std::atomic_bool                      m_bBeingDestroyed;
+    bool                                  m_bIsLocal;
+    bool                                  m_bIsRenderingPaused;
+    bool                                  m_bIsTransparent;
+    bool                                  m_bBrowserCreated = false;  // Lazy creation: tracks if CEF browser has been created
+    SString                               m_strPendingURL;            // Lazy creation: URL to load when browser is ready
+    bool                                  m_bPendingURLFilterEnabled = true;
+    SString                               m_strPendingPostData;
+    bool                                  m_bPendingURLEncoded = true;
+    POINT                                 m_vecMousePosition;
+    POINT                                 m_vecPendingMousePosition;       // Pending position for throttled mouse move
+    bool                                  m_bHasPendingMouseMove = false;  // Whether there's a pending throttled mouse move
+    std::chrono::steady_clock::time_point m_lastMouseMoveTime;             // For mouse move throttling
+    bool                                  m_mouseButtonStates[3];
+    SString                               m_CurrentTitle;
+    float                                 m_fVolume;
+    std::map<SString, SString>            m_Properties;
+    bool                                  m_bHasInputFocus;
+    std::set<std::string>                 m_AjaxHandlers;
+    std::shared_ptr<FEventTarget>         m_pEventTarget;
 
     struct
     {
-        bool                    changed = false;
-        std::mutex              dataMutex;
-        ECefThreadState         cefThreadState = ECefThreadState::Running;
-        std::condition_variable cefThreadCv;
-
-        const void*                buffer;
-        int                        width, height;
-        CefRenderHandler::RectList dirtyRects;
+        bool       changed = false;
+        std::mutex dataMutex;
+
+        // Main frame buffer - we now own this buffer (copied in OnPaint)
+        std::unique_ptr<byte[]> buffer;
+        size_t                  bufferSize = 0;
+        int                     width = 0;
+        int                     height = 0;
 
         CefRect                 popupRect;
         bool                    popupShown = false;

Client/cefweb/CWebView.h

@@ -392,6 +392,7 @@ void CClientVariables::LoadDefaults()
     DEFAULT("discord_rpc_share_data", false);            // Consistent Rich Presence data sharing
     DEFAULT("discord_rpc_share_data_firsttime", false);  // Display the user data sharing consent dialog box - for the first time
     DEFAULT("browser_enable_gpu", true);                 // Enable GPU in CEF? (allows stuff like WebGL to function)
+    DEFAULT("browser_enable_video_acceleration", true);  // Enable hardware video decoding in CEF?
     DEFAULT("process_cpu_affinity", true);               // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
     DEFAULT("ask_before_disconnect", true);              // Ask before disconnecting from a server
     DEFAULT("allow_steam_client", false);                // Allow connecting with the local Steam client (to set GTA:SA ingame status)

Client/core/CClientVariables.cpp

@@ -3240,13 +3240,15 @@ namespace
         int iOut = -2;
         if (*(DWORD*)dwThis != 0)
         {
+            // clang-format off
             _asm
             {
                 mov     ecx, dwThis
                 mov     ecx, [ecx]
                 call    dwFunc
                 mov     iOut, eax
             }
+            // clang-format on
         }
 
         return iOut;

Client/core/CCrashDumpWriter.cpp

@@ -45,6 +45,7 @@ class CGraphStats : public CGraphStatsInterface
     bool                              m_bEnabled;
     std::map<SString, SGraphStatLine> m_LineList;
     TIMEUS                            m_StartTime;
+    int                               m_iGraphSizeX;
 };
 
 ///////////////////////////////////////////////////////////////
@@ -112,16 +113,13 @@ void CGraphStats::AddTimingPoint(const char* szName)
     if (!IsEnabled())
         return;
 
-    CGraphicsInterface* pGraphics = g_pCore->GetGraphics();
-
-    std::uint32_t viewportWidth = pGraphics->GetViewportWidth();
-    std::uint32_t sizeX = viewportWidth / 4;  // one quarter of screen width
-
-    if (sizeX == 0)
+    // Use the cached graph width from Draw(), which runs in MTA's render zone
+    // with the real viewport. AddTimingPoint runs from OnBeginScene where GTA SA
+    // may have set a smaller internal viewport (water reflections, radar, etc.).
+    const int iSizeX = m_iGraphSizeX;
+    if (iSizeX <= 0)
         return;
 
-    const int iSizeX = static_cast<int>(sizeX);
-
     // Start of next frame?
     if (szName[0] == 0)
     {
@@ -162,7 +160,7 @@ void CGraphStats::AddTimingPoint(const char* szName)
         // Add new line
         MapSet(m_LineList, szName, SGraphStatLine());
         pLine = MapFind(m_LineList, szName);
-        pLine->dataHistory.resize(sizeX);
+        pLine->dataHistory.resize(iSizeX);
         pLine->iDataPos = 0;
         pLine->prevData = 0;
         pLine->strName = szName;
@@ -238,6 +236,14 @@ void CGraphStats::Draw()
 
     const int iSizeX = static_cast<int>(sizeX);
 
+    // Cache the graph width for AddTimingPoint, which may run outside MTA's render zone
+    // where GTA SA has temporarily changed the D3D viewport (water reflections, radar, etc.)
+    if (m_iGraphSizeX != iSizeX)
+    {
+        m_LineList.clear();
+        m_iGraphSizeX = iSizeX;
+    }
+
     originY = originY + sizeY + 30;  // add graph height plus a little gap to the overall Y position
 
     float fLineScale = 1 / 1000.f / rangeY * sizeY;