Skip to content

Commit 21f9381

Browse files
dmanlfcdmanlfc
authored
Merge pull request #16265 from dmanlfc/azahar-2126.0
azahar to 2126.0
2 parents 02d10c0 + 99b1639 commit 21f9381

4 files changed

Lines changed: 84 additions & 39 deletions

File tree

‎batocera-Changelog.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
Ensure you read the info text file in the traider folder
6969
- Vita3k added for capable aarch64 devices
7070
### Updated
71-
- Azahar to 2125.1.2
71+
- Azahar to 2126.0
7272
- BigPEmu to 1.221
7373
- Box64 0.4.2
7474
- Cemu to August 7th, 2026 build

‎package/batocera/core/batocera-configgen/configgen/configgen/generators/azahar/azaharGenerator.py‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ def writeAZAHARConfig(
115115
azaharConfig.set("System", "region_value", str(getAzaharLangFromEnvironment()))
116116
azaharConfig.set("System", r"region_value\default", "false")
117117

118+
## [CORE]
119+
if not azaharConfig.has_section("Core"):
120+
azaharConfig.add_section("Core")
121+
# CPU Clock Percentage
122+
azaharConfig.set("Core", "cpu_clock_percentage", system.config.get("azahar_cpu_clock", "100"))
123+
azaharConfig.set("Core", r"cpu_clock_percentage\default", "false")
124+
118125
## [UI]
119126
if not azaharConfig.has_section("UI"):
120127
azaharConfig.add_section("UI")
@@ -123,25 +130,25 @@ def writeAZAHARConfig(
123130
azaharConfig.set("UI", r"fullscreen\default", "false")
124131

125132
# Batocera - Defaults
126-
azaharConfig.set("UI", "displayTitleBars", "false")
127-
azaharConfig.set("UI", r"displayTitleBars\default", "false")
128-
azaharConfig.set("UI", "firstStart", "false")
129-
azaharConfig.set("UI", r"firstStart\default", "false")
130-
azaharConfig.set("UI", "hideInactiveMouse", "true")
131-
azaharConfig.set("UI", r"hideInactiveMouse\default", "false")
133+
azaharConfig.set("UI", "display_titlebar", "false")
134+
azaharConfig.set("UI", r"display_titlebar\default", "false")
135+
azaharConfig.set("UI", "first_start", "false")
136+
azaharConfig.set("UI", r"first_start\default", "false")
137+
azaharConfig.set("UI", "hide_mouse", "true")
138+
azaharConfig.set("UI", r"hide_mouse\default", "false")
132139
azaharConfig.set("UI", "enable_discord_presence", "false")
133140
azaharConfig.set("UI", r"enable_discord_presence\default", "false")
134141

135142
# Remove pop-up prompt on start
136-
azaharConfig.set("UI", "calloutFlags", "1")
137-
azaharConfig.set("UI", r"calloutFlags\default", "false")
143+
azaharConfig.set("UI", "callout_flags", "1")
144+
azaharConfig.set("UI", r"callout_flags\default", "false")
138145
# Close without confirmation
139-
azaharConfig.set("UI", "confirmClose", "false")
140-
azaharConfig.set("UI", r"confirmClose\default", "false")
146+
azaharConfig.set("UI", "confirm_before_closing", "false")
147+
azaharConfig.set("UI", r"confirm_before_closing\default", "false")
141148

142149
# screenshots
143-
azaharConfig.set("UI", r"Paths\screenshotPath", "/userdata/screenshots")
144-
azaharConfig.set("UI", r"Paths\screenshotPath\default", "false")
150+
azaharConfig.set("UI", r"Paths\screenshot_path", "/userdata/screenshots")
151+
azaharConfig.set("UI", r"Paths\screenshot_path\default", "false")
145152

146153
## [MISCELLANEOUS]
147154
if not azaharConfig.has_section("Miscellaneous"):
@@ -155,22 +162,22 @@ def writeAZAHARConfig(
155162
azaharConfig.add_section("Renderer")
156163
# Hardware Shader
157164
azaharConfig.set("Renderer", "use_hw_shader", system.config.get_bool("azahar_use_hw_shader", False, return_values=("true", "false")))
158-
azaharConfig.set("Renderer", r"use_hw_shader\default", system.config.get_bool("azahar_use_hw_shader", False, return_values=("true", "false")))
165+
azaharConfig.set("Renderer", r"use_hw_shader\default", "false")
159166
# Accurate Multiplication
160167
azaharConfig.set("Renderer", "shaders_accurate_mul", system.config.get_bool("azahar_accurate_multiplication", False, return_values=("true", "false")))
161-
azaharConfig.set("Renderer", r"shaders_accurate_mul\default", system.config.get_bool("azahar_accurate_multiplication", False, return_values=("true", "false")))
168+
azaharConfig.set("Renderer", r"shaders_accurate_mul\default", "false")
162169
# Shader JIT
163170
azaharConfig.set("Renderer", "use_shader_jit", system.config.get_bool("azahar_use_shader_jit", True, return_values=("true", "false")))
164-
azaharConfig.set("Renderer", r"use_hw_shader_jit\default", system.config.get_bool("azahar_use_shader_jit", True, return_values=("true", "false")))
171+
azaharConfig.set("Renderer", r"use_shader_jit\default", "false")
165172
# Async Shader Compilation
166173
azaharConfig.set("Renderer", "async_shader_compilation", system.config.get_bool("azahar_async_shader_compilation", False, return_values=("true", "false")))
167-
azaharConfig.set("Renderer", r"async_shader_compilation\default", system.config.get_bool("azahar_async_shader_compilation", False, return_values=("true", "false")))
174+
azaharConfig.set("Renderer", r"async_shader_compilation\default", "false")
168175
# Async Presentation
169176
azaharConfig.set("Renderer", "async_presentation", system.config.get_bool("azahar_async_presentation", False, return_values=("true", "false")))
170-
azaharConfig.set("Renderer", r"async_presentation\default", system.config.get_bool("azahar_async_presentation", False, return_values=("true", "false")))
177+
azaharConfig.set("Renderer", r"async_presentation\default", "false")
171178
# Software, OpenGL (default) or Vulkan
172179
azaharConfig.set("Renderer", "graphics_api", system.config.get("azahar_graphics_api", "1"))
173-
azaharConfig.set("Renderer", r"graphics_api\default", "true")
180+
azaharConfig.set("Renderer", r"graphics_api\default", "false")
174181
# Set Vulkan as necessary
175182
if system.config.get("azahar_graphics_api") == "2" and vulkan.is_available():
176183
_logger.debug("Vulkan driver is available on the system.")
@@ -186,11 +193,21 @@ def writeAZAHARConfig(
186193
else:
187194
_logger.debug("Discrete GPU is not available on the system. Using default.")
188195
# Use VSYNC
189-
azaharConfig.set("Renderer", "use_vsync_new", system.config.get_bool("azahar_use_vsync_new", True, return_values=("true", "false")))
190-
azaharConfig.set("Renderer", r"use_vsync_new\default", "false")
196+
azaharConfig.set("Renderer", "use_vsync", system.config.get_bool("azahar_use_vsync", True, return_values=("true", "false")))
197+
azaharConfig.set("Renderer", r"use_vsync\default", "false")
191198
# Resolution Factor
192199
azaharConfig.set("Renderer", "resolution_factor", system.config.get("azahar_resolution_factor", "1"))
193200
azaharConfig.set("Renderer", r"resolution_factor\default", "false")
201+
# Texture Filter
202+
azaharConfig.set("Renderer", "texture_filter", system.config.get("azahar_texture_filter", "0"))
203+
azaharConfig.set("Renderer", r"texture_filter\default", "false")
204+
205+
## [AUDIO]
206+
if not azaharConfig.has_section("Audio"):
207+
azaharConfig.add_section("Audio")
208+
# Audio Stretching
209+
azaharConfig.set("Audio", "enable_audio_stretching", system.config.get_bool("azahar_audio_stretching", True, return_values=("true", "false")))
210+
azaharConfig.set("Audio", r"enable_audio_stretching\default", "false")
194211

195212
## [WEB SERVICE]
196213
if not azaharConfig.has_section("WebService"):

‎package/batocera/emulators/azahar/azahar.emulator.yml‎

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ custom_features:
1515
prompt: SCREEN LAYOUT
1616
description: Arrange the dual screen layout. Separate windows can be changed with Hotkey+R2.
1717
choices:
18+
Bottom/Top: 0-true
1819
Top Only: 1-false
1920
Bottom Only: 1-true
2021
Large Top: 2-false
@@ -25,9 +26,9 @@ custom_features:
2526
Hybrid Screen Top: 5-false
2627
Hybrid Screen Bottom: 5-true
2728
azahar_large_screen_proportion:
28-
prompt: SCREEN PROPORTION
29-
description: Determines the proportion of the larger screen relative to the smaller one.
30-
choices:
29+
prompt: SCREEN PROPORTION
30+
description: Determines the proportion of the larger screen relative to the smaller one.
31+
choices:
3132
"2": 2
3233
"3": 3
3334
"4 (Default)": 4
@@ -48,10 +49,20 @@ custom_features:
4849
8x (3200x1920): 8
4950
9x (3600x2160): 9
5051
10x (4000x2400): 10
51-
azahar_use_vsync_new:
52+
azahar_texture_filter:
53+
submenu: GRAPHICS
54+
prompt: TEXTURE FILTER
55+
description: Enhance low-resolution textures using scaling algorithms.
56+
choices:
57+
None (Default): 0
58+
Anime4K: 1
59+
Bicubic: 2
60+
ScaleForce: 3
61+
xBRZ: 4
62+
azahar_use_vsync:
5263
submenu: GRAPHICS
5364
prompt: VSYNC
54-
description: Fix screen tearing. CPU heavy.
65+
description: Synchronize framerate with display refresh rate.
5566
choices:
5667
'Off': 0
5768
'On': 1
@@ -65,50 +76,67 @@ custom_features:
6576
azahar_accurate_multiplication:
6677
submenu: GRAPHICS
6778
prompt: ACCURATE MULTIPLICATION
68-
description: Some applications requires this to be enabled for the hardware shader to render properly. However this would reduce performance in most applications.
79+
description: Fixes rendering glitches in games like Luigi's Mansion and Pokemon, but costs performance.
6980
choices:
70-
'Off' : 0
81+
'Off': 0
7182
'On': 1
7283
azahar_use_shader_jit:
7384
submenu: GRAPHICS
7485
prompt: SHADER JIT
75-
description: Use the JIT engine instead of the interpreter for software shader emulation. Enable this for better performance.
86+
description: Use JIT compiler for shader emulation.
7687
choices:
77-
'Off' : 0
88+
'Off': 0
7889
'On': 1
7990
azahar_async_shader_compilation:
8091
submenu: GRAPHICS
81-
prompt: ENABLE ASYNC SHADER COMPILATION
82-
description: Compile shaders using background threads to avoid shader compilation stutter. May cause graphical glitches.
92+
prompt: ASYNC SHADER COMPILATION
93+
description: Compile shaders in background threads to avoid stuttering.
8394
choices:
8495
'Off': 0
8596
'On': 1
8697
azahar_async_presentation:
8798
submenu: GRAPHICS
88-
prompt: ENABLE ASYNC PRESENTATION
89-
description: Perform presentation on separate threads. Improves performance when using Vulkan in most applications. Adds ~1 frame of input lag.
99+
prompt: ASYNC PRESENTATION
100+
description: Separate display presentation from emulation threads (best with Vulkan).
90101
choices:
91102
'Off': 0
92103
'On': 1
93104
azahar_use_disk_shader_cache:
94105
submenu: GRAPHICS
95106
prompt: DISK SHADER CACHE
96-
description: Reduce stutter that happens when compiling shaders. Requires hardware shader to be enabled.
107+
description: Cache compiled shaders to storage to eliminate future stutter.
97108
choices:
98109
'Off': 0
99-
'On': 1
110+
'On (Default)': 1
100111
azahar_custom_textures:
101112
submenu: GRAPHICS
102113
prompt: LOAD CUSTOM TEXTURES
103-
description: Preloading is impossible from ES.
104114
choices:
105115
'Off': 0
106116
'On': 1-normal
107117
Preload: 1-preload
118+
azahar_audio_stretching:
119+
submenu: AUDIO
120+
prompt: AUDIO TIME STRETCHING
121+
description: Dynamically timestretch audio to prevent crackling on frame drops.
122+
choices:
123+
'Off': 0
124+
'On (Default)': 1
125+
azahar_cpu_clock:
126+
group: ADVANCED OPTIONS
127+
prompt: CPU CLOCK PERCENTAGE
128+
description: Overclock emulated 3DS CPU to improve framerates or run 60 FPS mods.
129+
choices:
130+
50%: 50
131+
100% (Default): 100
132+
150%: 150
133+
200%: 200
134+
300%: 300
135+
400%: 400
108136
azahar_is_new_3ds:
109137
group: ADVANCED OPTIONS
110138
prompt: NEW 3DS MODE
111-
description: The New 3DS has a faster processor, ZL/ZR buttons and a C-stick.
139+
description: Emulate New 3DS processor speed and additional controls (C-stick, ZL/ZR).
112140
choices:
113141
'Off': 0
114142
'On': 1

‎package/batocera/emulators/azahar/azahar.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
AZAHAR_VERSION = 2125.1.2
7+
AZAHAR_VERSION = 2126.0
88
AZAHAR_SITE = https://github.com/azahar-emu/azahar
99
AZAHAR_SITE_METHOD = git
1010
AZAHAR_GIT_SUBMODULES = YES

0 commit comments

Comments
 (0)