Skip to content

Commit

Permalink
first 3.3 build
Browse files Browse the repository at this point in the history
  • Loading branch information
SolDev69 committed Jul 17, 2024
1 parent 7168b88 commit e92548b
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 482 deletions.
34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,37 @@ local.properties
app_pojavlauncher/.cxx/
.vs/
/curseforge_key.txt

arc_dns_injector/bin/main/git/artdeell/arcdns/ArcDNSInjectorAgent.class
arc_dns_injector/bin/main/git/artdeell/arcdns/CacheUtil_J8.class
arc_dns_injector/bin/main/git/artdeell/arcdns/CacheUtil_J9.class
arc_dns_injector/bin/main/git/artdeell/arcdns/CacheUtilCommons.class
jre_lwjgl3glfw/bin/main/android/util/ArrayMap.class
jre_lwjgl3glfw/bin/main/android/util/ArrayMap$1.class
jre_lwjgl3glfw/bin/main/android/util/ContainerHelpers.class
jre_lwjgl3glfw/bin/main/android/util/EmptyArray.class
jre_lwjgl3glfw/bin/main/android/util/MapCollections.class
jre_lwjgl3glfw/bin/main/android/util/MapCollections$ArrayIterator.class
jre_lwjgl3glfw/bin/main/android/util/MapCollections$EntrySet.class
jre_lwjgl3glfw/bin/main/android/util/MapCollections$KeySet.class
jre_lwjgl3glfw/bin/main/android/util/MapCollections$MapIterator.class
jre_lwjgl3glfw/bin/main/android/util/MapCollections$ValuesCollection.class
jre_lwjgl3glfw/bin/main/android/util/Objects.class
jre_lwjgl3glfw/bin/main/net/java/openjdk/cacio/ctc/ExternalMouseReader.class
jre_lwjgl3glfw/bin/main/net/java/openjdk/cacio/ctc/InfdevGrabHandler.class
jre_lwjgl3glfw/bin/main/net/minecraft/client/ClientBrandRetriever.java.z
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/CallbackBridge.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/Callbacks.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFW.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFW$Functions.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeCocoa.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeEGL.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeNSGL.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeOSMesa.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeWayland.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeWGL.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeWin32.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWNativeX11.class
jre_lwjgl3glfw/bin/main/org/lwjgl/glfw/GLFWWindowProperties.class
jre_lwjgl3glfw/bin/main/org/lwjgl/input/InfdevMouse.class
jre_lwjgl3glfw/bin/main/org/lwjgl/opengl/GLCapabilities.class
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
if(LOCAL_RENDERER.equals("vulkan_zink_standard")) {
envMap.put("POJAVEXEC_OSMESA", "libOSMesa_std.so");
}
if(LOCAL_RENDERER.equals("vulkan_zink_pojav")) {
envMap.put("POJAVEXEC_OSMESA", "libOSMesa_pjv.so");
}
}
if(LauncherPreferences.PREF_BIG_CORE_AFFINITY) envMap.put("POJAV_BIG_CORE_AFFINITY", "1");
envMap.put("AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth > 0 ? CallbackBridge.windowWidth : CallbackBridge.physicalWidth));
Expand Down Expand Up @@ -505,12 +508,16 @@ public static String loadGraphicsLibrary(){
case "vulkan_zink_standard":
renderLibrary = "libOSMesa_std.so";
break;
case "vulkan_zink_standard":
renderLibrary = "libOSMesa_pjv.so";
break;
case "swrast":
case "panfrost_neo":
case "vulkan_zink":
case "adrhw_freedreno":
renderLibrary = "libOSMesa.so";
break;
case "opengles3_desktopgl_angle_vulkan" : renderLibrary = "libtinywrapper.so"; break;
case "opengles3_desktopgl_angle_vulkan_new" : renderLibrary = "libtinywrapper_new_angle.so"; break;
default:
Log.w("RENDER_LIBRARY", "No renderer selected, defaulting to opengles2");
renderLibrary = "libgl4es_114.so";
Expand Down
12 changes: 0 additions & 12 deletions app_pojavlauncher/src/main/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ LOCAL_SRC_FILES := tinywrapper/main.c tinywrapper/string_utils.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/tinywrapper
include $(BUILD_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := angle_gles2_new
LOCAL_SRC_FILES := tinywrapper_new_angle/angle-gles/$(TARGET_ARCH_ABI)/libGLESv2_angle.so
include $(PREBUILT_SHARED_LIBRARY)

include $(CLEAR_VARS)
LOCAL_MODULE := tinywrapper_new_angle
LOCAL_SHARED_LIBRARIES := angle_gles2_new
LOCAL_SRC_FILES := tinywrapper_new_angle/main.c tinywrapper_new_angle/string_utils.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/tinywrapper_new_angle
include $(BUILD_SHARED_LIBRARY)

include $(CLEAR_VARS)
# Link GLESv2 for test
LOCAL_LDLIBS := -ldl -llog -landroid
Expand Down
11 changes: 9 additions & 2 deletions app_pojavlauncher/src/main/jni/egl_bridge.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ int pojavInitOpenGL() {
} else if (strncmp("opengles", renderer, 8) == 0) {
solcraft_environ->config_renderer = RENDERER_GL4ES;
set_gl_bridge_tbl();
} else if (strcmp(renderer, "vulkan_zink") == 0 || strcmp(renderer, "vulkan_zink_standard") == 0) {
} else if (strcmp(renderer, "vulkan_zink") == 0 || strcmp(renderer, "vulkan_zink_standard") == 0 || strcmp(renderer, "vulkan_zink_pojav") == 0) {
solcraft_environ->config_renderer = RENDERER_VK_ZINK;
load_vulkan();
setenv("MESA_LOADER_DRIVER_OVERRIDE","zink",1);
Expand All @@ -271,16 +271,23 @@ int pojavInitOpenGL() {
setenv("MESA_GL_VERSION_OVERRIDE", "3.2",false);
setenv("MESA_GLSL_VERSION_OVERRIDE", "150",false);
set_osm_bridge_tbl();
} else if (strcmp(renderer, "malihw_panfrost") == 0) {
} else if (strcmp(renderer, "malihw_panfrost") == 0 || strcmp(renderer, "panfrost_neo") == 0) {
solcraft_environ->config_renderer = RENDERER_VK_ZINK;
setenv("GALLIUM_DRIVER", "panfrost", 1);
//if (strcmp(renderer, "panfrost_neo") == 0)
// setenv("MESA_LOADER_DRIVER_OVERRIDE","panfrost",1);
// May be needed
setenv("PAN_DEBUG","gofaster",1);
set_osm_bridge_tbl();
} else if (strcmp(renderer, "adrhw_freedreno") == 0) {
solcraft_environ->config_renderer = RENDERER_VK_ZINK;
setenv("GALLIUM_DRIVER", "freedreno", 1);
setenv("MESA_LOADER_DRIVER_OVERRIDE", "kgsl", 1);
set_osm_bridge_tbl();
} else if (strcmp(renderer, "swrast") == 0) {
solcraft_environ->config_renderer = RENDERER_VK_ZINK;
setenv("GALLIUM_DRIVER", "swrast", 1);
set_osm_bridge_tbl();
}
if(solcraft_environ->config_renderer == RENDERER_VK_ZINK || solcraft_environ->config_renderer == RENDERER_GL4ES) {
if(br_init()) {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
201 changes: 0 additions & 201 deletions app_pojavlauncher/src/main/jni/tinywrapper_new_angle/main.c

This file was deleted.

Loading

0 comments on commit e92548b

Please sign in to comment.