summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package.json2
-rw-r--r--py_modules/lsfg_vk/config_schema.py34
-rw-r--r--py_modules/lsfg_vk/configuration.py7
-rw-r--r--py_modules/lsfg_vk/plugin.py5
-rw-r--r--src/api/lsfgApi.ts4
-rw-r--r--src/components/ConfigurationSection.tsx8
-rw-r--r--src/components/UsageInstructions.tsx6
-rw-r--r--src/config/configSchema.ts10
-rw-r--r--tests/test_configuration.py2
9 files changed, 22 insertions, 56 deletions
diff --git a/package.json b/package.json
index 54135fd..dc41930 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "lossless-scaling-vk",
- "version": "0.6.2",
+ "version": "0.6.3",
"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.py b/py_modules/lsfg_vk/config_schema.py
index 460b0a0..45afc2d 100644
--- a/py_modules/lsfg_vk/config_schema.py
+++ b/py_modules/lsfg_vk/config_schema.py
@@ -38,13 +38,6 @@ class ConfigField:
# Configuration schema definition
CONFIG_SCHEMA: Dict[str, ConfigField] = {
- "enable": ConfigField(
- name="enable",
- field_type=ConfigFieldType.BOOLEAN,
- default=True,
- description="enable/disable lsfg on every game"
- ),
-
"dll": ConfigField(
name="dll",
field_type=ConfigFieldType.STRING,
@@ -55,7 +48,7 @@ CONFIG_SCHEMA: Dict[str, ConfigField] = {
"multiplier": ConfigField(
name="multiplier",
field_type=ConfigFieldType.INTEGER,
- default=2,
+ default=1,
description="change the fps multiplier"
),
@@ -112,7 +105,6 @@ CONFIG_SCHEMA: Dict[str, ConfigField] = {
class ConfigurationData(TypedDict):
"""Type-safe configuration data structure"""
- enable: bool
dll: str
multiplier: int
flow_scale: float
@@ -219,25 +211,21 @@ class ConfigurationManager:
# Add all configuration fields to the game section
for field_name, field_def in CONFIG_SCHEMA.items():
- # Skip dll and enable fields - dll goes in global, enable is handled via multiplier
- if field_name in ["dll", "enable"]:
+ # Skip dll field - dll goes in global section
+ if field_name == "dll":
continue
value = config[field_name]
- # Handle enable field by setting multiplier to 1 when disabled
- if field_name == "multiplier" and not config.get("enable", True):
- value = 1
- lines.append(f"# LSFG disabled via plugin - multiplier set to 1")
- else:
- lines.append(f"# {field_def.description}")
+ # Add field description comment
+ lines.append(f"# {field_def.description}")
# Format value based on type
if isinstance(value, bool):
lines.append(f"{field_name} = {str(value).lower()}")
elif isinstance(value, str) and value: # Only add non-empty strings
lines.append(f'{field_name} = "{value}"')
- elif isinstance(value, (int, float)) and value != 0: # Only add non-zero numbers
+ elif isinstance(value, (int, float)): # Always include numbers, even if 0 or 1
lines.append(f"{field_name} = {value}")
lines.append("") # Empty line for readability
@@ -306,12 +294,7 @@ class ConfigurationManager:
config[key] = value.lower() in ('true', '1', 'yes', 'on')
elif field_def.field_type == ConfigFieldType.INTEGER:
parsed_value = int(value)
- # Handle enable field via multiplier
- if key == "multiplier":
- config[key] = parsed_value
- config["enable"] = parsed_value != 1
- else:
- config[key] = parsed_value
+ config[key] = parsed_value
elif field_def.field_type == ConfigFieldType.FLOAT:
config[key] = float(value)
elif field_def.field_type == ConfigFieldType.STRING:
@@ -327,7 +310,7 @@ class ConfigurationManager:
return ConfigurationManager.get_defaults()
@staticmethod
- def create_config_from_args(enable: bool, dll: str, multiplier: int, flow_scale: float,
+ def create_config_from_args(dll: str, multiplier: int, flow_scale: float,
performance_mode: bool, hdr_mode: bool,
experimental_present_mode: str = "",
experimental_fps_limit: int = 0,
@@ -335,7 +318,6 @@ class ConfigurationManager:
disable_steamdeck_mode: bool = False) -> ConfigurationData:
"""Create configuration from individual arguments"""
return cast(ConfigurationData, {
- "enable": enable,
"dll": dll,
"multiplier": multiplier,
"flow_scale": flow_scale,
diff --git a/py_modules/lsfg_vk/configuration.py b/py_modules/lsfg_vk/configuration.py
index ae0194b..1952a49 100644
--- a/py_modules/lsfg_vk/configuration.py
+++ b/py_modules/lsfg_vk/configuration.py
@@ -65,7 +65,7 @@ class ConfigurationService(BaseService):
"error": None
}
- def update_config(self, enable: bool, dll: str, multiplier: int, flow_scale: float,
+ def update_config(self, dll: str, multiplier: int, flow_scale: float,
performance_mode: bool, hdr_mode: bool,
experimental_present_mode: str = "",
experimental_fps_limit: int = 0,
@@ -74,7 +74,6 @@ class ConfigurationService(BaseService):
"""Update TOML configuration
Args:
- enable: Whether to enable LSFG
dll: Path to Lossless.dll
multiplier: LSFG multiplier value
flow_scale: LSFG flow scale value
@@ -91,7 +90,7 @@ class ConfigurationService(BaseService):
try:
# Create configuration from individual arguments
config = ConfigurationManager.create_config_from_args(
- enable, dll, multiplier, flow_scale, performance_mode, hdr_mode,
+ dll, multiplier, flow_scale, performance_mode, hdr_mode,
experimental_present_mode, experimental_fps_limit, enable_wow64, disable_steamdeck_mode
)
@@ -109,7 +108,7 @@ class ConfigurationService(BaseService):
if not script_result["success"]:
self.log.warning(f"Failed to update launch script: {script_result['error']}")
- self.log.info(f"Updated lsfg TOML configuration: enable={enable}, "
+ self.log.info(f"Updated lsfg TOML configuration: "
f"dll='{dll}', multiplier={multiplier}, flow_scale={flow_scale}, "
f"performance_mode={performance_mode}, hdr_mode={hdr_mode}, "
f"experimental_present_mode='{experimental_present_mode}', "
diff --git a/py_modules/lsfg_vk/plugin.py b/py_modules/lsfg_vk/plugin.py
index 60eab8c..4e19a2a 100644
--- a/py_modules/lsfg_vk/plugin.py
+++ b/py_modules/lsfg_vk/plugin.py
@@ -184,7 +184,7 @@ class Plugin:
"defaults": ConfigurationManager.get_defaults()
}
- async def update_lsfg_config(self, enable: bool, dll: str, multiplier: int, flow_scale: float,
+ async def update_lsfg_config(self, dll: str, multiplier: int, flow_scale: float,
performance_mode: bool, hdr_mode: bool,
experimental_present_mode: str = "",
experimental_fps_limit: int = 0,
@@ -193,7 +193,6 @@ class Plugin:
"""Update lsfg TOML configuration
Args:
- enable: Whether to enable LSFG
dll: Path to Lossless.dll
multiplier: LSFG multiplier value
flow_scale: LSFG flow scale value
@@ -208,7 +207,7 @@ class Plugin:
ConfigurationResponse dict with success status
"""
return self.configuration_service.update_config(
- enable, dll, multiplier, flow_scale, performance_mode, hdr_mode,
+ dll, multiplier, flow_scale, performance_mode, hdr_mode,
experimental_present_mode, experimental_fps_limit, enable_wow64, disable_steamdeck_mode
)
diff --git a/src/api/lsfgApi.ts b/src/api/lsfgApi.ts
index 5bf2dc2..4c23955 100644
--- a/src/api/lsfgApi.ts
+++ b/src/api/lsfgApi.ts
@@ -92,14 +92,14 @@ export const getLaunchOption = callable<[], LaunchOptionResult>("get_launch_opti
// Updated config function using centralized configuration
export const updateLsfgConfig = callable<
- [boolean, string, number, number, boolean, boolean, string, number, boolean, boolean],
+ [string, number, number, boolean, boolean, string, number, boolean, boolean],
ConfigUpdateResult
>("update_lsfg_config");
// Helper function to create config update from configuration object
export const updateLsfgConfigFromObject = async (config: ConfigurationData): Promise<ConfigUpdateResult> => {
const args = ConfigurationManager.createArgsFromConfig(config);
- return updateLsfgConfig(...args as [boolean, string, number, number, boolean, boolean, string, number, boolean, boolean]);
+ return updateLsfgConfig(...args as [string, number, number, boolean, boolean, string, number, boolean, boolean]);
};
// Self-updater API functions
diff --git a/src/components/ConfigurationSection.tsx b/src/components/ConfigurationSection.tsx
index a55395e..00717bc 100644
--- a/src/components/ConfigurationSection.tsx
+++ b/src/components/ConfigurationSection.tsx
@@ -56,10 +56,10 @@ export function ConfigurationSection({
step={1}
notchCount={4}
notchLabels={[
- { notchIndex: 0, label: "OFF" },
- { notchIndex: 1, label: "2X" },
- { notchIndex: 2, label: "3X" },
- { notchIndex: 3, label: "4X" }
+ { notchIndex: 1, label: "OFF" },
+ { notchIndex: 2, label: "2X" },
+ { notchIndex: 3, label: "3X" },
+ { notchIndex: 4, label: "4X" }
]}
onChange={(value) => onConfigChange('multiplier', value)}
/>
diff --git a/src/components/UsageInstructions.tsx b/src/components/UsageInstructions.tsx
index be48a82..5de1fcf 100644
--- a/src/components/UsageInstructions.tsx
+++ b/src/components/UsageInstructions.tsx
@@ -33,10 +33,7 @@ export function UsageInstructions({ config }: UsageInstructionsProps) {
whiteSpace: "pre-wrap"
}}
>
- {config.enable
- ? "Add the launch option below (or use \"Launch Option Clipboard\") to Steam games to activate frame generation."
- : "LSFG is disabled. Enable it above and add the launch option to activate frame generation."
- }
+ Add the launch option below (or use "Launch Option Clipboard") to Steam games to activate frame generation.
</div>
</PanelSectionRow>
@@ -69,7 +66,6 @@ export function UsageInstructions({ config }: UsageInstructionsProps) {
}}
>
{`Current Configuration:
-• Enable: ${config.enable ? "Yes" : "No"}
• DLL Path: ${config.dll}
• Multiplier: ${config.multiplier}x
• Flow Scale: ${Math.round(config.flow_scale * 100)}%
diff --git a/src/config/configSchema.ts b/src/config/configSchema.ts
index 8715057..fa54336 100644
--- a/src/config/configSchema.ts
+++ b/src/config/configSchema.ts
@@ -23,13 +23,6 @@ export interface ConfigField {
// Configuration schema - must match Python CONFIG_SCHEMA
export const CONFIG_SCHEMA: Record<string, ConfigField> = {
- enable: {
- name: "enable",
- fieldType: ConfigFieldType.BOOLEAN,
- default: true,
- description: "enable/disable lsfg on every game"
- },
-
dll: {
name: "dll",
fieldType: ConfigFieldType.STRING,
@@ -40,7 +33,7 @@ export const CONFIG_SCHEMA: Record<string, ConfigField> = {
multiplier: {
name: "multiplier",
fieldType: ConfigFieldType.INTEGER,
- default: 2,
+ default: 1,
description: "change the fps multiplier"
},
@@ -96,7 +89,6 @@ export const CONFIG_SCHEMA: Record<string, ConfigField> = {
// Type-safe configuration data structure
export interface ConfigurationData {
- enable: boolean;
dll: string;
multiplier: number;
flow_scale: number;
diff --git a/tests/test_configuration.py b/tests/test_configuration.py
index f3fdcbe..1b10413 100644
--- a/tests/test_configuration.py
+++ b/tests/test_configuration.py
@@ -128,7 +128,6 @@ def test_config_roundtrip():
# Update config
result = service.update_config(
- enable=True,
dll="/path/to/dll",
multiplier=3,
flow_scale=1.5,
@@ -147,7 +146,6 @@ def test_config_roundtrip():
assert read_result["success"] is True
config = read_result["config"]
- assert config["enable"] is True
assert config["dll"] == "/path/to/dll"
assert config["multiplier"] == 3
assert config["flow_scale"] == 1.5
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 07:18:10 +0000