mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-11-16 07:20:38 +01:00
Add lsfg-vk to Initial setup
This commit is contained in:
parent
8470ad4b2a
commit
4f4f4a3586
3 changed files with 66 additions and 17 deletions
|
|
@ -81,6 +81,25 @@ class SettingsFragmentPresenter(
|
||||||
sl.apply {
|
sl.apply {
|
||||||
add(HeaderSetting(R.string.frame_gen))
|
add(HeaderSetting(R.string.frame_gen))
|
||||||
|
|
||||||
|
val installed = LosslessScalingHelper.isInstalled()
|
||||||
|
|
||||||
|
add(
|
||||||
|
RunnableSetting(
|
||||||
|
titleId = if (installed) {
|
||||||
|
R.string.lossless_scaling_replace
|
||||||
|
} else {
|
||||||
|
R.string.lossless_scaling_install
|
||||||
|
},
|
||||||
|
descriptionId = if (installed) {
|
||||||
|
R.string.lossless_scaling_replace_description
|
||||||
|
} else {
|
||||||
|
R.string.lossless_scaling_install_description
|
||||||
|
},
|
||||||
|
isRunnable = !NativeLibrary.isRunning(),
|
||||||
|
iconId = R.drawable.ic_install
|
||||||
|
) { settingsViewModel.setShouldShowLosslessInstaller(true) }
|
||||||
|
)
|
||||||
|
|
||||||
if (!LosslessScalingHelper.isSupportedByGpu()) {
|
if (!LosslessScalingHelper.isSupportedByGpu()) {
|
||||||
add(
|
add(
|
||||||
RunnableSetting(
|
RunnableSetting(
|
||||||
|
|
@ -92,28 +111,12 @@ class SettingsFragmentPresenter(
|
||||||
return@apply
|
return@apply
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!LosslessScalingHelper.isInstalled()) {
|
if (!installed) {
|
||||||
add(
|
|
||||||
RunnableSetting(
|
|
||||||
titleId = R.string.lossless_scaling_install,
|
|
||||||
descriptionId = R.string.lossless_scaling_install_description,
|
|
||||||
isRunnable = !NativeLibrary.isRunning(),
|
|
||||||
iconId = R.drawable.ic_install
|
|
||||||
) { settingsViewModel.setShouldShowLosslessInstaller(true) }
|
|
||||||
)
|
|
||||||
return@apply
|
return@apply
|
||||||
}
|
}
|
||||||
|
|
||||||
add(BooleanSetting.RENDERER_FRAME_GEN.key)
|
add(BooleanSetting.RENDERER_FRAME_GEN.key)
|
||||||
add(BooleanSetting.RENDERER_FRAME_GEN_DUMP_FLOW.key)
|
add(BooleanSetting.RENDERER_FRAME_GEN_DUMP_FLOW.key)
|
||||||
add(
|
|
||||||
RunnableSetting(
|
|
||||||
titleId = R.string.lossless_scaling_replace,
|
|
||||||
descriptionId = R.string.lossless_scaling_replace_description,
|
|
||||||
isRunnable = !NativeLibrary.isRunning(),
|
|
||||||
iconId = R.drawable.ic_install
|
|
||||||
) { settingsViewModel.setShouldShowLosslessInstaller(true) }
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ import org.yuzu.yuzu_emu.model.SetupPage
|
||||||
import org.yuzu.yuzu_emu.model.PageState
|
import org.yuzu.yuzu_emu.model.PageState
|
||||||
import org.yuzu.yuzu_emu.ui.main.MainActivity
|
import org.yuzu.yuzu_emu.ui.main.MainActivity
|
||||||
import org.yuzu.yuzu_emu.utils.DirectoryInitialization
|
import org.yuzu.yuzu_emu.utils.DirectoryInitialization
|
||||||
|
import org.yuzu.yuzu_emu.utils.LosslessScalingHelper
|
||||||
import org.yuzu.yuzu_emu.utils.NativeConfig
|
import org.yuzu.yuzu_emu.utils.NativeConfig
|
||||||
import org.yuzu.yuzu_emu.utils.ViewUtils
|
import org.yuzu.yuzu_emu.utils.ViewUtils
|
||||||
import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
|
import org.yuzu.yuzu_emu.utils.ViewUtils.setVisible
|
||||||
|
|
@ -202,6 +203,24 @@ class SetupFragment : Fragment() {
|
||||||
R.string.install_firmware_warning_help,
|
R.string.install_firmware_warning_help,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
add(
|
||||||
|
PageButton(
|
||||||
|
R.drawable.ic_frames,
|
||||||
|
R.string.lossless_scaling,
|
||||||
|
R.string.lossless_scaling_setup_description,
|
||||||
|
{
|
||||||
|
pageButtonCallback = it
|
||||||
|
getLosslessDll.launch(arrayOf("*/*"))
|
||||||
|
},
|
||||||
|
{
|
||||||
|
if (LosslessScalingHelper.isInstalled()) {
|
||||||
|
ButtonState.BUTTON_ACTION_COMPLETE
|
||||||
|
} else {
|
||||||
|
ButtonState.BUTTON_ACTION_INCOMPLETE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
add(
|
add(
|
||||||
PageButton(
|
PageButton(
|
||||||
R.drawable.ic_controller,
|
R.drawable.ic_controller,
|
||||||
|
|
@ -446,6 +465,32 @@ class SetupFragment : Fragment() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val getLosslessDll =
|
||||||
|
registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
|
||||||
|
if (result == null) {
|
||||||
|
return@registerForActivityResult
|
||||||
|
}
|
||||||
|
|
||||||
|
val resultStrings = resources.getStringArray(R.array.losslessDllResults)
|
||||||
|
ProgressDialogFragment.newInstance(
|
||||||
|
requireActivity(),
|
||||||
|
R.string.lossless_scaling_installing,
|
||||||
|
false
|
||||||
|
) { _, _ ->
|
||||||
|
val installResult = LosslessScalingHelper.install(result)
|
||||||
|
if (installResult == LosslessScalingHelper.RESULT_OK) {
|
||||||
|
getString(R.string.lossless_scaling_install_success)
|
||||||
|
} else {
|
||||||
|
MessageDialogFragment.newInstance(
|
||||||
|
titleId = R.string.lossless_scaling_install_failed,
|
||||||
|
descriptionString = resultStrings[installResult]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
|
onDialogComplete = { checkForButtonState.invoke() }
|
||||||
|
}.show(parentFragmentManager, ProgressDialogFragment.TAG)
|
||||||
|
}
|
||||||
|
|
||||||
val getGamesDirectory =
|
val getGamesDirectory =
|
||||||
registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
|
registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
|
|
|
||||||
|
|
@ -304,6 +304,7 @@
|
||||||
<string name="frame_gen_dump_flow_description">Write the optical flow mip levels to the lossless/debug folder once, for troubleshooting</string>
|
<string name="frame_gen_dump_flow_description">Write the optical flow mip levels to the lossless/debug folder once, for troubleshooting</string>
|
||||||
<string name="frame_gen_unsupported">Frame generation unavailable</string>
|
<string name="frame_gen_unsupported">Frame generation unavailable</string>
|
||||||
<string name="frame_gen_unsupported_description">This GPU driver does not support the Vulkan memory model, which the Lossless Scaling shaders require.</string>
|
<string name="frame_gen_unsupported_description">This GPU driver does not support the Vulkan memory model, which the Lossless Scaling shaders require.</string>
|
||||||
|
<string name="lossless_scaling_setup_description">Optional. Provide your own Lossless.dll to enable frame generation later</string>
|
||||||
<string name="lossless_scaling_install">Install Lossless.dll</string>
|
<string name="lossless_scaling_install">Install Lossless.dll</string>
|
||||||
<string name="lossless_scaling_install_description">Frame generation needs your own copy of Lossless.dll from Lossless Scaling</string>
|
<string name="lossless_scaling_install_description">Frame generation needs your own copy of Lossless.dll from Lossless Scaling</string>
|
||||||
<string name="lossless_scaling_replace_description">Select a different copy of Lossless.dll</string>
|
<string name="lossless_scaling_replace_description">Select a different copy of Lossless.dll</string>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue