liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zink with no ui

This commit is contained in:
Tungstend 2023-07-27 10:32:20 +08:00
parent 45b00f8ab2
commit 57b740e7e9
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FCL/src/main/java/com/tungsten/fcl/ui/manage/VersionSettingPage.java
View File

@ -153,6 +153,7 @@ public class VersionSettingPage extends FCLCommonPage implements ManageUI.Versio
rendererDataList.add(FCLConfig.Renderer.RENDERER_VIRGL); rendererDataList.add(FCLConfig.Renderer.RENDERER_VIRGL);
rendererDataList.add(FCLConfig.Renderer.RENDERER_ANGLE); rendererDataList.add(FCLConfig.Renderer.RENDERER_ANGLE);
rendererDataList.add(FCLConfig.Renderer.RENDERER_VGPU); rendererDataList.add(FCLConfig.Renderer.RENDERER_VGPU);
// rendererDataList.add(FCLConfig.Renderer.RENDERER_ZINK);
rendererSpinner.setDataList(rendererDataList); rendererSpinner.setDataList(rendererDataList);
// add spinner text // add spinner text
@ -177,6 +178,7 @@ public class VersionSettingPage extends FCLCommonPage implements ManageUI.Versio
rendererList.add(getContext().getString(R.string.settings_fcl_renderer_virgl)); rendererList.add(getContext().getString(R.string.settings_fcl_renderer_virgl));
rendererList.add(getContext().getString(R.string.settings_fcl_renderer_angle)); rendererList.add(getContext().getString(R.string.settings_fcl_renderer_angle));
rendererList.add(getContext().getString(R.string.settings_fcl_renderer_vgpu)); rendererList.add(getContext().getString(R.string.settings_fcl_renderer_vgpu));
// rendererList.add(getContext().getString(R.string.settings_fcl_renderer_zink));
ArrayAdapter<String> rendererAdapter = new ArrayAdapter<>(getContext(), R.layout.item_spinner_auto_tint, rendererList); ArrayAdapter<String> rendererAdapter = new ArrayAdapter<>(getContext(), R.layout.item_spinner_auto_tint, rendererList);
rendererAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown); rendererAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown);
rendererSpinner.setAdapter(rendererAdapter); rendererSpinner.setAdapter(rendererAdapter);

1
FCL/src/main/res/values/strings.xml
View File

@ -686,6 +686,7 @@
<string name="settings_fcl_renderer_virgl" translatable="false">VirGLRenderer (OpenGL 4.3)</string> <string name="settings_fcl_renderer_virgl" translatable="false">VirGLRenderer (OpenGL 4.3)</string>
<string name="settings_fcl_renderer_angle">ANGLE (OpenGL 4.6, only support 1.17+)</string> <string name="settings_fcl_renderer_angle">ANGLE (OpenGL 4.6, only support 1.17+)</string>
<string name="settings_fcl_renderer_vgpu" >VGPU (OpenGL 2.1+, only support 1.17-)</string> <string name="settings_fcl_renderer_vgpu" >VGPU (OpenGL 2.1+, only support 1.17-)</string>
<string name="settings_fcl_renderer_zink" translatable="false">Vulkan Zink (OpenGL 4.6)</string>
<string name="settings_game">Game Settings</string> <string name="settings_game">Game Settings</string>
<string name="settings_game_dimension">Resolution</string> <string name="settings_game_dimension">Resolution</string>

3
FCLauncher/src/main/java/com/tungsten/fclauncher/FCLConfig.java
View File

@ -12,7 +12,8 @@ public class FCLConfig implements Serializable {
RENDERER_GL4ES("Holy-GL4ES:libgl4es_114.so:libEGL.so"), RENDERER_GL4ES("Holy-GL4ES:libgl4es_114.so:libEGL.so"),
RENDERER_VIRGL("VirGLRenderer:libOSMesa_8.so:libEGL.so"), RENDERER_VIRGL("VirGLRenderer:libOSMesa_8.so:libEGL.so"),
RENDERER_ANGLE("ANGLE:libtinywrapper.so:libEGL_angle.so"), RENDERER_ANGLE("ANGLE:libtinywrapper.so:libEGL_angle.so"),
RENDERER_VGPU("VGPU:libvgpu.so:libEGL.so"); RENDERER_VGPU("VGPU:libvgpu.so:libEGL.so"),
RENDERER_ZINK("Zink:libOSMesa_8.so:libEGL.so");
private final String glInfo; private final String glInfo;
private String glVersion; private String glVersion;

2
FCLauncher/src/main/java/com/tungsten/fclauncher/FCLauncher.java
View File

@ -159,6 +159,8 @@ public class FCLauncher {
if (renderer == FCLConfig.Renderer.RENDERER_VIRGL) { if (renderer == FCLConfig.Renderer.RENDERER_VIRGL) {
envMap.put("GALLIUM_DRIVER", "virpipe"); envMap.put("GALLIUM_DRIVER", "virpipe");
envMap.put("OSMESA_NO_FLUSH_FRONTBUFFER", "1"); envMap.put("OSMESA_NO_FLUSH_FRONTBUFFER", "1");
} else {
envMap.put("GALLIUM_DRIVER", "zink");
} }
} }
} }