diff options
Diffstat (limited to 'py_modules/lsfg_vk')
| -rw-r--r-- | py_modules/lsfg_vk/config_schema.py | 25 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/config_schema_generated.py | 45 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/configuration.py | 55 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/configuration_helpers_generated.py | 22 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/constants.py | 4 | ||||
| -rw-r--r-- | py_modules/lsfg_vk/installation.py | 50 |
6 files changed, 82 insertions, 119 deletions
diff --git a/py_modules/lsfg_vk/config_schema.py b/py_modules/lsfg_vk/config_schema.py index 4ab2dcb..f76b5f2 100644 --- a/py_modules/lsfg_vk/config_schema.py +++ b/py_modules/lsfg_vk/config_schema.py @@ -71,10 +71,6 @@ SCRIPT_ONLY_FIELDS = { # Complete configuration schema (TOML + script-only fields) COMPLETE_CONFIG_SCHEMA = {**CONFIG_SCHEMA, **SCRIPT_ONLY_FIELDS} - -# Import auto-generated configuration components -from .config_schema_generated import ConfigurationData, get_script_parsing_logic, get_script_generation_logic - # Constants for profile management DEFAULT_PROFILE_NAME = "decky-lsfg-vk" GLOBAL_SECTION_FIELDS = {"dll", "no_fp16"} @@ -182,7 +178,7 @@ class ConfigurationManager: "profiles": {DEFAULT_PROFILE_NAME: config}, "global_config": { "dll": config.get("dll", ""), - "no_fp16": False # Always enabled even if previously set + "no_fp16": config.get("no_fp16", False) } } return ConfigurationManager.generate_toml_content_multi_profile(profile_data) @@ -192,7 +188,7 @@ class ConfigurationManager: """Generate TOML configuration file content with multiple profiles""" lines = ["version = 1"] lines.append("") - + # Add global section with global fields lines.append("[global]") @@ -206,10 +202,11 @@ class ConfigurationManager: if dll_path: lines.append(f"# specify where Lossless.dll is stored") lines.append(f'dll = "{dll_path}"') - lines.append("") - + lines.append("") + lines.append(f"# FP16 acceleration") - lines.append(f"no_fp16 = false") + no_fp16 = bool(profile_data["global_config"].get("no_fp16", False)) + lines.append(f"no_fp16 = {str(no_fp16).lower()}") lines.append("") # Add game sections for each profile @@ -343,8 +340,7 @@ class ConfigurationManager: elif key == "dll": global_config["dll"] = value elif key == "no_fp16": - # Always enforce FP16 to be enabled (no_fp16 = false) - global_config["no_fp16"] = False + global_config["no_fp16"] = value.lower() in ('true', '1', 'yes', 'on') # Handle game section elif in_game_section: @@ -447,13 +443,6 @@ class ConfigurationManager: return cast(ConfigurationData, merged_config) @staticmethod - @staticmethod - def create_config_from_args(**kwargs) -> ConfigurationData: - """Create configuration from keyword arguments - USES GENERATED CODE""" - from .config_schema_generated import create_config_dict - return create_config_dict(**kwargs) - - @staticmethod def normalize_profile_name(profile_name: str) -> str: """Normalize profile name by converting spaces to dashes and trimming diff --git a/py_modules/lsfg_vk/config_schema_generated.py b/py_modules/lsfg_vk/config_schema_generated.py index 53e9693..b320a97 100644 --- a/py_modules/lsfg_vk/config_schema_generated.py +++ b/py_modules/lsfg_vk/config_schema_generated.py @@ -3,7 +3,7 @@ Auto-generated configuration schema components from shared_config.py DO NOT EDIT THIS FILE MANUALLY - it will be overwritten on build """ -from typing import TypedDict, Dict, Any, Union, cast +from typing import TypedDict, Dict, Any, Union from enum import Enum import sys from pathlib import Path @@ -122,47 +122,4 @@ def get_script_generation_logic(): return generate_script_lines -def get_function_parameters() -> str: - """Return function signature parameters""" - return """dll: str = "/games/Lossless Scaling/Lossless.dll", - no_fp16: bool = False, - multiplier: int = 1, - flow_scale: float = 0.8, - performance_mode: bool = False, - hdr_mode: bool = False, - experimental_present_mode: str = "fifo", - dxvk_frame_rate: int = 0, - enable_wow64: bool = False, - disable_steamdeck_mode: bool = False, - mangohud_workaround: bool = False, - disable_vkbasalt: bool = False, - force_enable_vkbasalt: bool = False, - enable_wsi: bool = False, - enable_zink: bool = False""" - - -def create_config_dict(**kwargs) -> ConfigurationData: - """Create configuration dictionary from keyword arguments""" - return cast(ConfigurationData, { - "dll": kwargs.get("dll"), - "no_fp16": kwargs.get("no_fp16"), - "multiplier": kwargs.get("multiplier"), - "flow_scale": kwargs.get("flow_scale"), - "performance_mode": kwargs.get("performance_mode"), - "hdr_mode": kwargs.get("hdr_mode"), - "experimental_present_mode": kwargs.get("experimental_present_mode"), - "dxvk_frame_rate": kwargs.get("dxvk_frame_rate"), - "enable_wow64": kwargs.get("enable_wow64"), - "disable_steamdeck_mode": kwargs.get("disable_steamdeck_mode"), - "mangohud_workaround": kwargs.get("mangohud_workaround"), - "disable_vkbasalt": kwargs.get("disable_vkbasalt"), - "force_enable_vkbasalt": kwargs.get("force_enable_vkbasalt"), - "enable_wsi": kwargs.get("enable_wsi"), - "enable_zink": kwargs.get("enable_zink"), - }) - - -# Field lists for dynamic operations -TOML_FIELDS = ['dll', 'no_fp16', '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', 'enable_wsi', 'enable_zink'] ALL_FIELDS = ['dll', 'no_fp16', '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', 'enable_zink'] diff --git a/py_modules/lsfg_vk/configuration.py b/py_modules/lsfg_vk/configuration.py index 74a3694..fce3738 100644 --- a/py_modules/lsfg_vk/configuration.py +++ b/py_modules/lsfg_vk/configuration.py @@ -8,7 +8,7 @@ from typing import Dict, Any from .base_service import BaseService from .config_schema import ConfigurationManager, CONFIG_SCHEMA, ProfileData, DEFAULT_PROFILE_NAME from .config_schema_generated import ConfigurationData, get_script_generation_logic -from .configuration_helpers_generated import log_configuration_update +from .constants import ARMADA_DEVICE_ENV, ARMADA_GAME_LAUNCH from .types import ConfigurationResponse, ProfilesResponse, ProfileResponse @@ -81,29 +81,6 @@ class ConfigurationService(BaseService): self.log.error(error_msg) return self._error_response(ConfigurationResponse, str(e), config=None) - def update_config(self, **kwargs) -> ConfigurationResponse: - """Update TOML configuration using generated schema - SIMPLIFIED WITH GENERATED CODE - - Args: - **kwargs: Configuration field values (see shared_config.py for available fields) - - Returns: - ConfigurationResponse with success status - """ - try: - config = ConfigurationManager.create_config_from_args(**kwargs) - - return self.update_config_from_dict(config) - - except (OSError, IOError) as e: - error_msg = f"Error updating lsfg config: {str(e)}" - self.log.error(error_msg) - return self._error_response(ConfigurationResponse, str(e), config=None) - except ValueError as e: - error_msg = f"Invalid configuration arguments: {str(e)}" - self.log.error(error_msg) - return self._error_response(ConfigurationResponse, str(e), config=None) - def update_lsfg_script(self, config: ConfigurationData) -> ConfigurationResponse: """Update the ~/lsfg launch script with current configuration @@ -147,10 +124,8 @@ class ConfigurationService(BaseService): generate_script_lines = get_script_generation_logic() lines.extend(generate_script_lines(config)) - lines.extend([ - "export LSFG_PROCESS=decky-lsfg-vk", - 'exec "$@"' - ]) + lines.append("export LSFG_PROCESS=decky-lsfg-vk") + lines.extend(self._generate_game_launch_lines()) return "\n".join(lines) + "\n" @@ -178,12 +153,28 @@ class ConfigurationService(BaseService): generate_script_lines = get_script_generation_logic() lines.extend(generate_script_lines(merged_config)) - lines.extend([ - f"export LSFG_PROCESS={current_profile}", - 'exec "$@"' - ]) + lines.append(f"export LSFG_PROCESS={current_profile}") + lines.extend(self._generate_game_launch_lines()) return "\n".join(lines) + "\n" + + @staticmethod + def _generate_game_launch_lines() -> list[str]: + """Generate a portable exec block with Armada's host wrapper.""" + device_env = ARMADA_DEVICE_ENV.as_posix() + game_launch = ARMADA_GAME_LAUNCH.as_posix() + return [ + f'armada_game_launch="{game_launch}"', + 'for argument in "$@"; do', + ' if [ "$argument" = "$armada_game_launch" ]; then', + ' exec "$@"', + " fi", + "done", + f'if [ -f "{device_env}" ] && [ -x "$armada_game_launch" ]; then', + ' exec "$armada_game_launch" "$@"', + "fi", + 'exec "$@"', + ] def _get_profile_data(self) -> ProfileData: """Get current profile data from config file""" diff --git a/py_modules/lsfg_vk/configuration_helpers_generated.py b/py_modules/lsfg_vk/configuration_helpers_generated.py deleted file mode 100644 index 1383174..0000000 --- a/py_modules/lsfg_vk/configuration_helpers_generated.py +++ /dev/null @@ -1,22 +0,0 @@ -""" -Auto-generated configuration helper functions from shared_config.py -DO NOT EDIT THIS FILE MANUALLY - it will be overwritten on build -""" - -from typing import Dict, Any -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']}, no_fp16={config['no_fp16']}, 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']}, enable_zink={config['enable_zink']}") - - -def get_config_field_names() -> list[str]: - """Get all configuration field names""" - return ALL_FIELDS.copy() - - -def extract_config_values(config: ConfigurationData) -> Dict[str, Any]: - """Extract configuration values as a dictionary""" - return {field: config[field] for field in ALL_FIELDS} diff --git a/py_modules/lsfg_vk/constants.py b/py_modules/lsfg_vk/constants.py index 3d8e44a..023894f 100644 --- a/py_modules/lsfg_vk/constants.py +++ b/py_modules/lsfg_vk/constants.py @@ -14,6 +14,7 @@ CONFIG_FILENAME = "conf.toml" LIB_FILENAME = "liblsfg-vk.so" JSON_FILENAME = "VkLayer_LS_frame_generation.json" ZIP_FILENAME = "lsfg-vk_noui.zip" +ARM_LIB_FILENAME = "liblsfg-vk-arm64.so" FLATPAK_23_08_FILENAME = "org.freedesktop.Platform.VulkanLayer.lsfg_vk_23.08.flatpak" FLATPAK_24_08_FILENAME = "org.freedesktop.Platform.VulkanLayer.lsfg_vk_24.08.flatpak" @@ -24,6 +25,9 @@ JSON_EXT = ".json" BIN_DIR = "bin" +ARMADA_DEVICE_ENV = Path("/usr/libexec/armada/device-env") +ARMADA_GAME_LAUNCH = Path("/usr/libexec/armada/armada-game-launch") + STEAM_COMMON_PATH = Path("steamapps/common/Lossless Scaling") LOSSLESS_DLL_NAME = "Lossless.dll" diff --git a/py_modules/lsfg_vk/installation.py b/py_modules/lsfg_vk/installation.py index 4329d49..ce47268 100644 --- a/py_modules/lsfg_vk/installation.py +++ b/py_modules/lsfg_vk/installation.py @@ -3,6 +3,7 @@ Installation service for lsfg-vk. """ import os +import platform import shutil import traceback import zipfile @@ -14,7 +15,7 @@ from typing import Dict, Any from .base_service import BaseService from .constants import ( LIB_FILENAME, JSON_FILENAME, ZIP_FILENAME, BIN_DIR, - SO_EXT, JSON_EXT + SO_EXT, JSON_EXT, ARM_LIB_FILENAME, ARMADA_DEVICE_ENV ) from .config_schema import ConfigurationManager from .types import InstallationResponse, UninstallationResponse, InstallationCheckResponse @@ -48,6 +49,13 @@ class InstallationService(BaseService): self._extract_and_install_files(zip_path) + # If on ARM, overwrite the .so with the ARM version + if self._is_arm_architecture(): + self.log.info("Detected ARM architecture, using ARM binary") + arm_so_path = plugin_dir / BIN_DIR / ARM_LIB_FILENAME + self._copy_plugin_file(arm_so_path, self.lib_file) + self.log.info(f"Overwrote with ARM binary: {self.lib_file}") + self._create_config_file() self._create_lsfg_launch_script() @@ -64,6 +72,42 @@ class InstallationService(BaseService): self.log.error(error_msg) return self._error_response(InstallationResponse, str(e), message="") + def _is_arm_architecture(self) -> bool: + """Check if running on ARM architecture + + Returns: + True if running on ARM (aarch64), False otherwise + """ + if platform.machine().lower() in ('aarch64', 'arm64'): + return True + + # Decky runs through FEX on Armada, so Python reports x86_64 even + # though the host is AArch64. Armada exposes this native helper only + # on its ARM image, including inside Decky's FEX rootfs. + if ARMADA_DEVICE_ENV.is_file(): + self.log.info("Detected native AArch64 Armada host through device-env") + return True + + # Fall back to the native PID 1 ELF header. e_machine 183 is AArch64. + try: + with Path('/proc/1/exe').open('rb') as host_executable: + elf_header = host_executable.read(20) + if elf_header[:4] == b'\x7fELF' and elf_header[5] in (1, 2): + byte_order = 'little' if elf_header[5] == 1 else 'big' + if int.from_bytes(elf_header[18:20], byte_order) == 183: + self.log.info("Detected native AArch64 host through PID 1") + return True + except OSError as e: + self.log.debug(f"Could not inspect native host architecture: {e}") + + return False + + @staticmethod + def _copy_plugin_file(src_file: Path, dst_file: Path) -> None: + """Copy plugin content without preserving FEX-incompatible metadata.""" + shutil.copyfile(src_file, dst_file) + dst_file.chmod(0o644) + def _extract_and_install_files(self, zip_path: Path) -> None: """Extract zip file and install files to appropriate locations @@ -101,7 +145,7 @@ class InstallationService(BaseService): if file_path.suffix == JSON_EXT and file == JSON_FILENAME: self._copy_and_fix_json_file(src_file, dst_file) else: - shutil.copy2(src_file, dst_file) + self._copy_plugin_file(src_file, dst_file) self.log.info(f"Copied {file} to {dst_file}") @@ -131,7 +175,7 @@ class InstallationService(BaseService): except (json.JSONDecodeError, KeyError, OSError) as e: self.log.error(f"Error fixing JSON file {src_file}: {e}") # Fallback to simple copy if JSON modification fails - shutil.copy2(src_file, dst_file) + self._copy_plugin_file(src_file, dst_file) def _create_config_file(self) -> None: """Create or update the TOML config file in ~/.config/lsfg-vk with default configuration and detected DLL path |