From 44a194886d29807ddc5c29dc2266145f756d4eb2 Mon Sep 17 00:00:00 2001
From: Lauri Kasanen <cand@gmx.com>
Date: Mon, 22 Nov 2021 11:46:23 +0200
Subject: [PATCH] Keep nvidia-failed status permanently, so later clients don't
 try it in vain

---
 common/rfb/TightX264Encoder.cxx | 8 ++++++--
 common/rfb/TightX264Encoder.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/rfb/TightX264Encoder.cxx b/common/rfb/TightX264Encoder.cxx
index b56b890..5968020 100644
--- a/common/rfb/TightX264Encoder.cxx
+++ b/common/rfb/TightX264Encoder.cxx
@@ -41,6 +41,8 @@ static LogWriter vlog("x264");
 static const PixelFormat pfRGBX(32, 24, false, true, 255, 255, 255, 0, 8, 16);
 static const PixelFormat pfBGRX(32, 24, false, true, 255, 255, 255, 16, 8, 0);
 
+bool TightX264Encoder::skip_nvidia = false;
+
 TightX264Encoder::TightX264Encoder(SConnection* conn, EncCache *cache_, uint8_t cacheType_) :
   Encoder(conn, encodingTight, (EncoderFlags)(EncoderUseNativePF | EncoderLossy), -1),
   keyframe(true), enc(NULL), params(NULL), mux(NULL), muxstate(NULL), framectr(0),
@@ -485,11 +487,13 @@ bool TightX264Encoder::tryInit(const PixelBuffer* pb) {
   w = pb->width();
   h = pb->height();
 
-  if (nvidia_init(w, h, rfb::Server::x264Bitrate,
+  if (skip_nvidia || nvidia_init(w, h, rfb::Server::x264Bitrate,
               rfb::Server::frameRate) != 0) {
-    vlog.error("nvidia init failed, falling back to x264");
+    if (!skip_nvidia)
+      vlog.error("nvidia init failed, falling back to x264");
     using_nvidia = false;
     nvidia_init_done = true;
+    skip_nvidia = true;
     myw = w;
     myh = h;
     return true;
diff --git a/common/rfb/TightX264Encoder.h b/common/rfb/TightX264Encoder.h
index c87644a..5e7f116 100644
--- a/common/rfb/TightX264Encoder.h
+++ b/common/rfb/TightX264Encoder.h
@@ -66,6 +66,7 @@ namespace rfb {
 
     bool nvidia_init_done;
     bool using_nvidia;
+    static bool skip_nvidia;
 
     EncCache *encCache;
     uint8_t cacheType;