diff options
| author | xXJSONDeruloXx <danielhimebauch@gmail.com> | 2025-07-26 14:53:30 -0400 |
|---|---|---|
| committer | xXJSONDeruloXx <danielhimebauch@gmail.com> | 2025-07-26 14:53:30 -0400 |
| commit | ab8ddfef740ad2877e4d82be6471474c89755653 (patch) | |
| tree | a297382b9f0d2c77b14fc3f12597b43a760c6ec0 | |
| parent | b4fbaf233f6e190001cb40f4f0cc87cc5365e622 (diff) | |
| download | decky-lsfg-vk-ab8ddfef740ad2877e4d82be6471474c89755653.tar.gz decky-lsfg-vk-ab8ddfef740ad2877e4d82be6471474c89755653.zip | |
swap wsi disable to enable, ui toggle off state as enable = 0 on default
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/config_schema_generated.py | 16 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/configuration_helpers_generated.py | 2 | ||||
| -rw-r--r-- | scripts/generate_python_boilerplate.py | 14 | ||||
| -rw-r--r-- | shared_config.py | 8 | ||||
| -rw-r--r-- | src/components/ConfigurationSection.tsx | 10 | ||||
| -rw-r--r-- | src/config/configSchema.ts | 2 | ||||
| -rw-r--r-- | src/config/generatedConfigSchema.ts | 16 |
8 files changed, 35 insertions, 35 deletions
diff --git a/package.json b/package.json index a798f8b..d56a9f5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "decky-lossless-scaling-vk", - "version": "0.7.3", + "version": "0.7.4", "description": "Use Lossless Scaling on the Steam Deck using the lsfg-vk vulkan layer", "type": "module", "scripts": { diff --git a/py_modules/lsfg_vk/config_schema_generated.py b/py_modules/lsfg_vk/config_schema_generated.py index 783e22f..50d2a4f 100644 --- a/py_modules/lsfg_vk/config_schema_generated.py +++ b/py_modules/lsfg_vk/config_schema_generated.py @@ -25,7 +25,7 @@ DISABLE_STEAMDECK_MODE = "disable_steamdeck_mode" MANGOHUD_WORKAROUND = "mangohud_workaround" DISABLE_VKBASALT = "disable_vkbasalt" FORCE_ENABLE_VKBASALT = "force_enable_vkbasalt" -DEACTIVATE_WSI = "deactivate_wsi" +ENABLE_WSI = "enable_wsi" class ConfigurationData(TypedDict): @@ -42,7 +42,7 @@ class ConfigurationData(TypedDict): mangohud_workaround: bool disable_vkbasalt: bool force_enable_vkbasalt: bool - deactivate_wsi: bool + enable_wsi: bool def get_script_parsing_logic(): @@ -76,7 +76,7 @@ def get_script_parsing_logic(): if key == "ENABLE_VKBASALT": script_values["force_enable_vkbasalt"] = value == "1" if key == "ENABLE_GAMESCOPE_WSI": - script_values["deactivate_wsi"] = value == "0" + script_values["enable_wsi"] = value != "0" return script_values return parse_script_values @@ -99,7 +99,7 @@ def get_script_generation_logic(): lines.append("export DISABLE_VKBASALT=1") if config.get("force_enable_vkbasalt", False): lines.append("export ENABLE_VKBASALT=1") - if config.get("deactivate_wsi", False): + if not config.get("enable_wsi", False): lines.append("export ENABLE_GAMESCOPE_WSI=0") return lines return generate_script_lines @@ -119,7 +119,7 @@ def get_function_parameters() -> str: mangohud_workaround: bool = False, disable_vkbasalt: bool = False, force_enable_vkbasalt: bool = False, - deactivate_wsi: bool = True""" + enable_wsi: bool = False""" def create_config_dict(**kwargs) -> ConfigurationData: @@ -137,11 +137,11 @@ def create_config_dict(**kwargs) -> ConfigurationData: "mangohud_workaround": kwargs.get("mangohud_workaround"), "disable_vkbasalt": kwargs.get("disable_vkbasalt"), "force_enable_vkbasalt": kwargs.get("force_enable_vkbasalt"), - "deactivate_wsi": kwargs.get("deactivate_wsi"), + "enable_wsi": kwargs.get("enable_wsi"), }) # Field lists for dynamic operations TOML_FIELDS = ['dll', 'multiplier', 'flow_scale', 'performance_mode', 'hdr_mode', 'experimental_present_mode'] -SCRIPT_FIELDS = ['dxvk_frame_rate', 'enable_wow64', 'disable_steamdeck_mode', 'mangohud_workaround', 'disable_vkbasalt', 'force_enable_vkbasalt', 'deactivate_wsi'] -ALL_FIELDS = ['dll', 'multiplier', 'flow_scale', 'performance_mode', 'hdr_mode', 'experimental_present_mode', 'dxvk_frame_rate', 'enable_wow64', 'disable_steamdeck_mode', 'mangohud_workaround', 'disable_vkbasalt', 'force_enable_vkbasalt', 'deactivate_wsi'] +SCRIPT_FIELDS = ['dxvk_frame_rate', 'enable_wow64', 'disable_steamdeck_mode', 'mangohud_workaround', 'disable_vkbasalt', 'force_enable_vkbasalt', 'enable_wsi'] +ALL_FIELDS = ['dll', 'multiplier', 'flow_scale', 'performance_mode', 'hdr_mode', 'experimental_present_mode', 'dxvk_frame_rate', 'enable_wow64', 'disable_steamdeck_mode', 'mangohud_workaround', 'disable_vkbasalt', 'force_enable_vkbasalt', 'enable_wsi'] diff --git a/py_modules/lsfg_vk/configuration_helpers_generated.py b/py_modules/lsfg_vk/configuration_helpers_generated.py index d099cca..b34865a 100644 --- a/py_modules/lsfg_vk/configuration_helpers_generated.py +++ b/py_modules/lsfg_vk/configuration_helpers_generated.py @@ -9,7 +9,7 @@ from .config_schema_generated import ConfigurationData, ALL_FIELDS def log_configuration_update(logger, config: ConfigurationData) -> None: """Log configuration update with all field values""" - logger.info(f"Updated lsfg TOML configuration: dll={config['dll']}, multiplier={config['multiplier']}, flow_scale={config['flow_scale']}, performance_mode={config['performance_mode']}, hdr_mode={config['hdr_mode']}, experimental_present_mode={config['experimental_present_mode']}, dxvk_frame_rate={config['dxvk_frame_rate']}, enable_wow64={config['enable_wow64']}, disable_steamdeck_mode={config['disable_steamdeck_mode']}, mangohud_workaround={config['mangohud_workaround']}, disable_vkbasalt={config['disable_vkbasalt']}, force_enable_vkbasalt={config['force_enable_vkbasalt']}, deactivate_wsi={config['deactivate_wsi']}") + logger.info(f"Updated lsfg TOML configuration: dll={config['dll']}, multiplier={config['multiplier']}, flow_scale={config['flow_scale']}, performance_mode={config['performance_mode']}, hdr_mode={config['hdr_mode']}, experimental_present_mode={config['experimental_present_mode']}, dxvk_frame_rate={config['dxvk_frame_rate']}, enable_wow64={config['enable_wow64']}, disable_steamdeck_mode={config['disable_steamdeck_mode']}, mangohud_workaround={config['mangohud_workaround']}, disable_vkbasalt={config['disable_vkbasalt']}, force_enable_vkbasalt={config['force_enable_vkbasalt']}, enable_wsi={config['enable_wsi']}") def get_config_field_names() -> list[str]: diff --git a/scripts/generate_python_boilerplate.py b/scripts/generate_python_boilerplate.py index b3aa4e0..d09ef91 100644 --- a/scripts/generate_python_boilerplate.py +++ b/scripts/generate_python_boilerplate.py @@ -36,7 +36,7 @@ def get_env_var_name(field_name: str) -> str: "mangohud_workaround": "MANGOHUD", "disable_vkbasalt": "DISABLE_VKBASALT", "force_enable_vkbasalt": "ENABLE_VKBASALT", - "deactivate_wsi": "ENABLE_GAMESCOPE_WSI" + "enable_wsi": "ENABLE_GAMESCOPE_WSI" } return env_map.get(field_name, field_name.upper()) @@ -106,10 +106,10 @@ def generate_script_parsing() -> str: # Special case: SteamDeck=0 means disable_steamdeck_mode=True lines.append(f' elif key == "{env_var}":') lines.append(f' script_values["{field_name}"] = value == "0"') - elif field_name == "deactivate_wsi": - # Special case: ENABLE_GAMESCOPE_WSI=0 means deactivate_wsi=True + elif field_name == "enable_wsi": + # Special case: ENABLE_GAMESCOPE_WSI=0 means enable_wsi=False lines.append(f' elif key == "{env_var}":') - lines.append(f' script_values["{field_name}"] = value == "0"') + lines.append(f' script_values["{field_name}"] = value != "0"') else: lines.append(f' elif key == "{env_var}":') lines.append(f' script_values["{field_name}"] = value == "1"') @@ -151,9 +151,9 @@ def generate_script_generation() -> str: # Special case: disable_steamdeck_mode=True should export SteamDeck=0 lines.append(f' if config.get("{field_name}", False):') lines.append(f' lines.append("export {env_var}=0")') - elif field_name == "deactivate_wsi": - # Special case: deactivate_wsi=True should export ENABLE_GAMESCOPE_WSI=0 - lines.append(f' if config.get("{field_name}", False):') + elif field_name == "enable_wsi": + # Special case: enable_wsi=False should export ENABLE_GAMESCOPE_WSI=0 + lines.append(f' if not config.get("{field_name}", False):') lines.append(f' lines.append("export {env_var}=0")') else: lines.append(f' if config.get("{field_name}", False):') diff --git a/shared_config.py b/shared_config.py index 4a32776..09aa596 100644 --- a/shared_config.py +++ b/shared_config.py @@ -116,11 +116,11 @@ CONFIG_SCHEMA_DEF = { "location": "script" }, - "deactivate_wsi": { - "name": "deactivate_wsi", + "enable_wsi": { + "name": "enable_wsi", "fieldType": ConfigFieldType.BOOLEAN, - "default": True, - "description": "Deactivates Gamescope WSI Layer, use with HDR off, workaround if frame generation isn't applying or isn't feeling smooth", + "default": False, + "description": "Enable Gamescope WSI Layer, disable if frame generation isn't applying or isn't feeling smooth (use with HDR off)", "location": "script" } } diff --git a/src/components/ConfigurationSection.tsx b/src/components/ConfigurationSection.tsx index c1fcf25..d208f97 100644 --- a/src/components/ConfigurationSection.tsx +++ b/src/components/ConfigurationSection.tsx @@ -6,7 +6,7 @@ import { FpsMultiplierControl } from "./FpsMultiplierControl"; import { FLOW_SCALE, PERFORMANCE_MODE, HDR_MODE, EXPERIMENTAL_PRESENT_MODE, DXVK_FRAME_RATE, DISABLE_STEAMDECK_MODE, - MANGOHUD_WORKAROUND, DISABLE_VKBASALT, FORCE_ENABLE_VKBASALT, DEACTIVATE_WSI + MANGOHUD_WORKAROUND, DISABLE_VKBASALT, FORCE_ENABLE_VKBASALT, ENABLE_WSI } from "../config/generatedConfigSchema"; interface ConfigurationSectionProps { @@ -163,10 +163,10 @@ export function ConfigurationSection({ <> <PanelSectionRow> <ToggleField - label="Deactivate WSI" - description="Deactivates Gamescope WSI Layer, use with HDR off, workaround if frame generation isn't applying or isn't feeling smooth" - checked={config.deactivate_wsi} - onChange={(value) => onConfigChange(DEACTIVATE_WSI, value)} + label="Enable WSI" + description="Enable Gamescope WSI Layer, disable if frame generation isn't applying or isn't feeling smooth (use with HDR off)" + checked={config.enable_wsi} + onChange={(value) => onConfigChange(ENABLE_WSI, value)} /> </PanelSectionRow> diff --git a/src/config/configSchema.ts b/src/config/configSchema.ts index 0fe3d16..ed590df 100644 --- a/src/config/configSchema.ts +++ b/src/config/configSchema.ts @@ -23,7 +23,7 @@ export { DLL, MULTIPLIER, FLOW_SCALE, PERFORMANCE_MODE, HDR_MODE, EXPERIMENTAL_PRESENT_MODE, DXVK_FRAME_RATE, ENABLE_WOW64, DISABLE_STEAMDECK_MODE, MANGOHUD_WORKAROUND, DISABLE_VKBASALT, - FORCE_ENABLE_VKBASALT, DEACTIVATE_WSI + FORCE_ENABLE_VKBASALT, ENABLE_WSI } from './generatedConfigSchema'; /** diff --git a/src/config/generatedConfigSchema.ts b/src/config/generatedConfigSchema.ts index dfd80db..866558c 100644 --- a/src/config/generatedConfigSchema.ts +++ b/src/config/generatedConfigSchema.ts @@ -20,7 +20,7 @@ export const DISABLE_STEAMDECK_MODE = "disable_steamdeck_mode" as const; export const MANGOHUD_WORKAROUND = "mangohud_workaround" as const; export const DISABLE_VKBASALT = "disable_vkbasalt" as const; export const FORCE_ENABLE_VKBASALT = "force_enable_vkbasalt" as const; -export const DEACTIVATE_WSI = "deactivate_wsi" as const; +export const ENABLE_WSI = "enable_wsi" as const; // Configuration field definition export interface ConfigField { @@ -104,11 +104,11 @@ export const CONFIG_SCHEMA: Record<string, ConfigField> = { default: false, description: "Force vkBasalt to engage to fix framepacing issues in gamemode" }, - deactivate_wsi: { - name: "deactivate_wsi", + enable_wsi: { + name: "enable_wsi", fieldType: ConfigFieldType.BOOLEAN, - default: true, - description: "Deactivates Gamescope WSI Layer, use with HDR off, workaround if frame generation isn't applying or isn't feeling smooth" + default: false, + description: "Enable Gamescope WSI Layer, disable if frame generation isn't applying or isn't feeling smooth (use with HDR off)" }, }; @@ -126,7 +126,7 @@ export interface ConfigurationData { mangohud_workaround: boolean; disable_vkbasalt: boolean; force_enable_vkbasalt: boolean; - deactivate_wsi: boolean; + enable_wsi: boolean; } // Helper functions @@ -148,7 +148,7 @@ export function getDefaults(): ConfigurationData { mangohud_workaround: false, disable_vkbasalt: false, force_enable_vkbasalt: false, - deactivate_wsi: true, + enable_wsi: false, }; } @@ -166,7 +166,7 @@ export function getFieldTypes(): Record<string, ConfigFieldType> { mangohud_workaround: ConfigFieldType.BOOLEAN, disable_vkbasalt: ConfigFieldType.BOOLEAN, force_enable_vkbasalt: ConfigFieldType.BOOLEAN, - deactivate_wsi: ConfigFieldType.BOOLEAN, + enable_wsi: ConfigFieldType.BOOLEAN, }; } |
