add disable_vkbasalt=1 defaulted, hidden ui to expose to users later if desired

10 files changed, 66 insertions, 22 deletions

diff --git a/py_modules/lsfg_vk/configuration.py b/py_modules/lsfg_vk/configuration.py
index f5e2981..cf3c9a3 100644
--- a/py_modules/lsfg_vk/configuration.py
+++ b/py_modules/lsfg_vk/configuration.py
@@ -66,7 +66,8 @@ class ConfigurationService(BaseService):
             "flow_scale": 1.0,
             "hdr": False,
             "perf_mode": False,
-            "immediate_mode": False
+            "immediate_mode": False,
+            "disable_vkbasalt": False
         }
         
         lines = content.split('\n')
@@ -102,11 +103,15 @@ class ConfigurationService(BaseService):
             # Parse MESA_VK_WSI_PRESENT_MODE
             elif match := re.match(r'^(#\s*)?export\s+MESA_VK_WSI_PRESENT_MODE=([^\s#]+)', line):
                 config["immediate_mode"] = not bool(match.group(1)) and match.group(2) == 'immediate'
+            
+            # Parse DISABLE_VKBASALT
+            elif match := re.match(r'^(#\s*)?export\s+DISABLE_VKBASALT=(\d+)', line):
+                config["disable_vkbasalt"] = not bool(match.group(1)) and match.group(2) == '1'
         
         return config
     
     def update_config(self, enable_lsfg: bool, multiplier: int, flow_scale: float, 
-                     hdr: bool, perf_mode: bool, immediate_mode: bool) -> ConfigurationResponse:
+                     hdr: bool, perf_mode: bool, immediate_mode: bool, disable_vkbasalt: bool) -> ConfigurationResponse:
         """Update lsfg script configuration
         
         Args:
@@ -116,6 +121,7 @@ class ConfigurationService(BaseService):
             hdr: Whether to enable HDR
             perf_mode: Whether to enable performance mode
             immediate_mode: Whether to enable immediate present mode (disable vsync)
+            disable_vkbasalt: Whether to disable vkbasalt layer
             
         Returns:
             ConfigurationResponse with success status
@@ -123,7 +129,7 @@ class ConfigurationService(BaseService):
         try:
             # Generate script content using template
             script_content = self._generate_script_content(
-                enable_lsfg, multiplier, flow_scale, hdr, perf_mode, immediate_mode
+                enable_lsfg, multiplier, flow_scale, hdr, perf_mode, immediate_mode, disable_vkbasalt
             )
             
             # Write the updated script atomically
@@ -131,7 +137,8 @@ class ConfigurationService(BaseService):
             
             self.log.info(f"Updated lsfg script configuration: enable={enable_lsfg}, "
                          f"multiplier={multiplier}, flow_scale={flow_scale}, hdr={hdr}, "
-                         f"perf_mode={perf_mode}, immediate_mode={immediate_mode}")
+                         f"perf_mode={perf_mode}, immediate_mode={immediate_mode}, "
+                         f"disable_vkbasalt={disable_vkbasalt}")
             
             return {
                 "success": True,
@@ -151,7 +158,7 @@ class ConfigurationService(BaseService):
             }
     
     def _generate_script_content(self, enable_lsfg: bool, multiplier: int, flow_scale: float,
-                               hdr: bool, perf_mode: bool, immediate_mode: bool) -> str:
+                               hdr: bool, perf_mode: bool, immediate_mode: bool, disable_vkbasalt: bool) -> str:
         """Generate script content from configuration parameters
         
         Args:
@@ -161,6 +168,7 @@ class ConfigurationService(BaseService):
             hdr: Whether to enable HDR
             perf_mode: Whether to enable performance mode
             immediate_mode: Whether to enable immediate present mode
+            disable_vkbasalt: Whether to disable vkbasalt layer
             
         Returns:
             Generated script content
@@ -171,5 +179,6 @@ class ConfigurationService(BaseService):
             flow_scale=flow_scale,
             hdr="export LSFG_HDR=1" if hdr else "# export LSFG_HDR=1",
             perf_mode="export LSFG_PERF_MODE=1" if perf_mode else "# export LSFG_PERF_MODE=1",
-            immediate_mode="export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync" if immediate_mode else "# export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync"
+            immediate_mode="export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync" if immediate_mode else "# export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync",
+            disable_vkbasalt="export DISABLE_VKBASALT=1" if disable_vkbasalt else "# export DISABLE_VKBASALT=1"
         )
diff --git a/py_modules/lsfg_vk/constants.py b/py_modules/lsfg_vk/constants.py
index ceaf12b..2440d9d 100644
--- a/py_modules/lsfg_vk/constants.py
+++ b/py_modules/lsfg_vk/constants.py
@@ -35,6 +35,7 @@ export LSFG_FLOW_SCALE={flow_scale}
 {hdr}
 {perf_mode}
 {immediate_mode}
+{disable_vkbasalt}
 
 # Execute the passed command with the environment variables set
 exec "$@"
@@ -52,3 +53,4 @@ DEFAULT_ENABLE_LSFG = True
 DEFAULT_HDR = False
 DEFAULT_PERF_MODE = True
 DEFAULT_IMMEDIATE_MODE = False
+DEFAULT_DISABLE_VKBASALT = True
diff --git a/py_modules/lsfg_vk/installation.py b/py_modules/lsfg_vk/installation.py
index 1d0e96f..4e02091 100644
--- a/py_modules/lsfg_vk/installation.py
+++ b/py_modules/lsfg_vk/installation.py
@@ -14,7 +14,7 @@ from .constants import (
     LIB_FILENAME, JSON_FILENAME, ZIP_FILENAME, BIN_DIR,
     SO_EXT, JSON_EXT, LSFG_SCRIPT_TEMPLATE,
     DEFAULT_MULTIPLIER, DEFAULT_FLOW_SCALE, DEFAULT_ENABLE_LSFG,
-    DEFAULT_HDR, DEFAULT_PERF_MODE, DEFAULT_IMMEDIATE_MODE
+    DEFAULT_HDR, DEFAULT_PERF_MODE, DEFAULT_IMMEDIATE_MODE, DEFAULT_DISABLE_VKBASALT
 )
 from .types import InstallationResponse, UninstallationResponse, InstallationCheckResponse
 
@@ -111,7 +111,8 @@ class InstallationService(BaseService):
             flow_scale=DEFAULT_FLOW_SCALE,
             hdr="export LSFG_HDR=1" if DEFAULT_HDR else "# export LSFG_HDR=1",
             perf_mode="export LSFG_PERF_MODE=1" if DEFAULT_PERF_MODE else "# export LSFG_PERF_MODE=1",
-            immediate_mode="export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync" if DEFAULT_IMMEDIATE_MODE else "# export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync"
+            immediate_mode="export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync" if DEFAULT_IMMEDIATE_MODE else "# export MESA_VK_WSI_PRESENT_MODE=immediate # - disable vsync",
+            disable_vkbasalt="export DISABLE_VKBASALT=1" if DEFAULT_DISABLE_VKBASALT else "# export DISABLE_VKBASALT=1"
         )
         
         # Use atomic write to prevent corruption
diff --git a/py_modules/lsfg_vk/plugin.py b/py_modules/lsfg_vk/plugin.py
index 000830f..5fb6c8f 100644
--- a/py_modules/lsfg_vk/plugin.py
+++ b/py_modules/lsfg_vk/plugin.py
@@ -73,7 +73,7 @@ class Plugin:
         return self.configuration_service.get_config()
 
     async def update_lsfg_config(self, enable_lsfg: bool, multiplier: int, flow_scale: float, 
-                          hdr: bool, perf_mode: bool, immediate_mode: bool) -> Dict[str, Any]:
+                          hdr: bool, perf_mode: bool, immediate_mode: bool, disable_vkbasalt: bool) -> Dict[str, Any]:
         """Update lsfg script configuration
         
         Args:
@@ -83,12 +83,13 @@ class Plugin:
             hdr: Whether to enable HDR
             perf_mode: Whether to enable performance mode
             immediate_mode: Whether to enable immediate present mode (disable vsync)
+            disable_vkbasalt: Whether to disable vkbasalt layer
             
         Returns:
             ConfigurationResponse dict with success status
         """
         return self.configuration_service.update_config(
-            enable_lsfg, multiplier, flow_scale, hdr, perf_mode, immediate_mode
+            enable_lsfg, multiplier, flow_scale, hdr, perf_mode, immediate_mode, disable_vkbasalt
         )
 
     # Plugin lifecycle methods
diff --git a/py_modules/lsfg_vk/types.py b/py_modules/lsfg_vk/types.py
index f0ec892..07dd768 100644
--- a/py_modules/lsfg_vk/types.py
+++ b/py_modules/lsfg_vk/types.py
@@ -62,6 +62,7 @@ class ConfigurationData(TypedDict):
     hdr: bool
     perf_mode: bool
     immediate_mode: bool
+    disable_vkbasalt: bool
 
 
 class ConfigurationResponse(BaseResponse):
diff --git a/src/api/lsfgApi.ts b/src/api/lsfgApi.ts
index a35f274..0a0b502 100644
--- a/src/api/lsfgApi.ts
+++ b/src/api/lsfgApi.ts
@@ -34,6 +34,7 @@ export interface LsfgConfig {
   hdr: boolean;
   perf_mode: boolean;
   immediate_mode: boolean;
+  disable_vkbasalt: boolean;
 }
 
 export interface ConfigResult {
@@ -55,6 +56,6 @@ export const checkLsfgVkInstalled = callable<[], InstallationStatus>("check_lsfg
 export const checkLosslessScalingDll = callable<[], DllDetectionResult>("check_lossless_scaling_dll");
 export const getLsfgConfig = callable<[], ConfigResult>("get_lsfg_config");
 export const updateLsfgConfig = callable<
-  [boolean, number, number, boolean, boolean, boolean],
+  [boolean, number, number, boolean, boolean, boolean, boolean],
   ConfigUpdateResult
 >("update_lsfg_config");
diff --git a/src/components/ConfigurationSection.tsx b/src/components/ConfigurationSection.tsx
index ee18e5b..34955f8 100644
--- a/src/components/ConfigurationSection.tsx
+++ b/src/components/ConfigurationSection.tsx
@@ -7,6 +7,7 @@ interface LsfgConfig {
   hdr: boolean;
   perfMode: boolean;
   immediateMode: boolean;
+  disableVkbasalt: boolean;
 }
 
 interface ConfigurationSectionProps {
@@ -17,6 +18,7 @@ interface ConfigurationSectionProps {
   onHdrChange: (value: boolean) => Promise<void>;
   onPerfModeChange: (value: boolean) => Promise<void>;
   onImmediateModeChange: (value: boolean) => Promise<void>;
+  onDisableVkbasaltChange: (value: boolean) => Promise<void>;
 }
 
 export function ConfigurationSection({
@@ -26,7 +28,8 @@ export function ConfigurationSection({
   onFlowScaleChange,
   onHdrChange,
   onPerfModeChange,
-  onImmediateModeChange
+  onImmediateModeChange,
+  onDisableVkbasaltChange
 }: ConfigurationSectionProps) {
   return (
     <>
@@ -110,6 +113,15 @@ export function ConfigurationSection({
           onChange={onImmediateModeChange}
         />
       </PanelSectionRow>
+
+      {/* <PanelSectionRow>
+        <ToggleField
+          label="Disable vkbasalt"
+          description="Some plugins add vkbasalt layer, which can break lsfg. Toggling on fixes this"
+          checked={config.disableVkbasalt}
+          onChange={onDisableVkbasaltChange}
+        />
+      </PanelSectionRow> */}
     </>
   );
 }
diff --git a/src/components/Content.tsx b/src/components/Content.tsx
index 0e17f3c..16c8f2f 100644
--- a/src/components/Content.tsx
+++ b/src/components/Content.tsx
@@ -36,32 +36,37 @@ export function Content() {
   // Configuration change handlers
   const handleEnableLsfgChange = async (value: boolean) => {
     setters.setEnableLsfg(value);
-    await updateConfig(value, config.multiplier, config.flowScale, config.hdr, config.perfMode, config.immediateMode);
+    await updateConfig(value, config.multiplier, config.flowScale, config.hdr, config.perfMode, config.immediateMode, config.disableVkbasalt);
   };
 
   const handleMultiplierChange = async (value: number) => {
     setters.setMultiplier(value);
-    await updateConfig(config.enableLsfg, value, config.flowScale, config.hdr, config.perfMode, config.immediateMode);
+    await updateConfig(config.enableLsfg, value, config.flowScale, config.hdr, config.perfMode, config.immediateMode, config.disableVkbasalt);
   };
 
   const handleFlowScaleChange = async (value: number) => {
     setters.setFlowScale(value);
-    await updateConfig(config.enableLsfg, config.multiplier, value, config.hdr, config.perfMode, config.immediateMode);
+    await updateConfig(config.enableLsfg, config.multiplier, value, config.hdr, config.perfMode, config.immediateMode, config.disableVkbasalt);
   };
 
   const handleHdrChange = async (value: boolean) => {
     setters.setHdr(value);
-    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, value, config.perfMode, config.immediateMode);
+    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, value, config.perfMode, config.immediateMode, config.disableVkbasalt);
   };
 
   const handlePerfModeChange = async (value: boolean) => {
     setters.setPerfMode(value);
-    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, config.hdr, value, config.immediateMode);
+    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, config.hdr, value, config.immediateMode, config.disableVkbasalt);
   };
 
   const handleImmediateModeChange = async (value: boolean) => {
     setters.setImmediateMode(value);
-    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, config.hdr, config.perfMode, value);
+    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, config.hdr, config.perfMode, value, config.disableVkbasalt);
+  };
+
+  const handleDisableVkbasaltChange = async (value: boolean) => {
+    setters.setDisableVkbasalt(value);
+    await updateConfig(config.enableLsfg, config.multiplier, config.flowScale, config.hdr, config.perfMode, config.immediateMode, value);
   };
 
   const onInstall = () => {
@@ -99,6 +104,7 @@ export function Content() {
           onHdrChange={handleHdrChange}
           onPerfModeChange={handlePerfModeChange}
           onImmediateModeChange={handleImmediateModeChange}
+          onDisableVkbasaltChange={handleDisableVkbasaltChange}
         />
       )}
 
diff --git a/src/components/UsageInstructions.tsx b/src/components/UsageInstructions.tsx
index a826d3d..ca9ddd2 100644
--- a/src/components/UsageInstructions.tsx
+++ b/src/components/UsageInstructions.tsx
@@ -8,6 +8,7 @@ interface ConfigType {
   hdr: boolean;
   perfMode: boolean;
   immediateMode: boolean;
+  disableVkbasalt: boolean;
 }
 
 interface UsageInstructionsProps {
@@ -41,6 +42,10 @@ export function UsageInstructions({ config }: UsageInstructionsProps) {
       envVars.push("MESA_VK_WSI_PRESENT_MODE=immediate");
     }
     
+    if (config.disableVkbasalt) {
+      envVars.push("DISABLE_VKBASALT=1");
+    }
+    
     return envVars.length > 0 ? `${envVars.join(" ")} %command%` : "%command%";
   };
 
diff --git a/src/hooks/useLsfgHooks.ts b/src/hooks/useLsfgHooks.ts
index d9b1406..c0bd8e8 100644
--- a/src/hooks/useLsfgHooks.ts
+++ b/src/hooks/useLsfgHooks.ts
@@ -76,6 +76,7 @@ export function useLsfgConfig() {
   const [hdr, setHdr] = useState<boolean>(false);
   const [perfMode, setPerfMode] = useState<boolean>(true);
   const [immediateMode, setImmediateMode] = useState<boolean>(false);
+  const [disableVkbasalt, setDisableVkbasalt] = useState<boolean>(true);
 
   const loadLsfgConfig = async () => {
     try {
@@ -87,6 +88,7 @@ export function useLsfgConfig() {
         setHdr(result.config.hdr);
         setPerfMode(result.config.perf_mode);
         setImmediateMode(result.config.immediate_mode);
+        setDisableVkbasalt(result.config.disable_vkbasalt);
         console.log("Loaded lsfg config:", result.config);
       } else {
         console.log("lsfg config not available, using defaults:", result.error);
@@ -102,7 +104,8 @@ export function useLsfgConfig() {
     newFlowScale: number,
     newHdr: boolean,
     newPerfMode: boolean,
-    newImmediateMode: boolean
+    newImmediateMode: boolean,
+    newDisableVkbasalt: boolean
   ): Promise<ConfigUpdateResult> => {
     try {
       const result = await updateLsfgConfig(
@@ -111,7 +114,8 @@ export function useLsfgConfig() {
         newFlowScale,
         newHdr,
         newPerfMode,
-        newImmediateMode
+        newImmediateMode,
+        newDisableVkbasalt
       );
       if (!result.success) {
         toaster.toast({
@@ -140,7 +144,8 @@ export function useLsfgConfig() {
       flowScale,
       hdr,
       perfMode,
-      immediateMode
+      immediateMode,
+      disableVkbasalt
     },
     setters: {
       setEnableLsfg,
@@ -148,7 +153,8 @@ export function useLsfgConfig() {
       setFlowScale,
       setHdr,
       setPerfMode,
-      setImmediateMode
+      setImmediateMode,
+      setDisableVkbasalt
     },
     loadLsfgConfig,
     updateConfig