rebase and fix conflicts

2023-03-07 07:23:03 -05:00
parent 8a9fd18228 47bdc828c1
commit 252fc2f20c
53 changed files with 1398 additions and 114 deletions
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -2243,6 +2243,39 @@ sub DefineConfigToCLIConversion {
          isPresent($value) && $value ne 'auto';
        }
    }),
+    KasmVNC::CliOption->new({
+        name => 'hw3d',
+        configKeys => [
+          KasmVNC::ConfigKey->new({
+            name => "desktop.gpu.hw3d",
+            type => KasmVNC::ConfigKey::BOOLEAN
+          })
+        ],
+        toStringSub => sub {
+          $self = shift;
+          my $value = $self->configValue();
+
+          switch($value) {
+            case 'true' {
+              $valuesStr = '-hw3d ';
+            }
+            case 'false' {
+              $valuesStr = ' ';
+            }
+          }
+
+          return $valuesStr;
+        }
+    }),
+    KasmVNC::CliOption->new({
+        name => 'drinode',
+        configKeys => [
+          KasmVNC::ConfigKey->new({
+            name => "desktop.gpu.drinode",
+            type => KasmVNC::ConfigKey::ANY
+          })
+        ]
+    }),
  );

  %cliArgMap = map { ("-" . $_->{name}) => $_ } @xvncOptions;