PojavLauncherTeam/PojavLauncher_iOS
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'backend-virgl' into main

Browse Source
This commit is contained in:
Adam Tunnic authored and GitHub committed 2022-02-14 08:52:10 -05:00
2 parents a022974429 72e0c69ad1
commit 959a4e2290
10 files changed
+296 -245
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

JavaApp/src/main/java/org/lwjgl/glfw/GLFW.java
+61 -76
View File
@@ -535,19 +535,10 @@ public class GLFW
}
}
} catch (IllegalAccessException e) {
// This will never happend since this is accessing itself
// This will never happen since this is accessing itself
}
}
private static native long nativeEglGetCurrentContext();
private static native boolean nativeEglInit();
public static native boolean nativeEglMakeCurrent(long window);
public static native void nativeEglDetachOnCurrentThread();
public static native long nativeEglCreateContext(long contextSrc);
private static native boolean nativeEglTerminate();
private static native boolean nativeEglSwapBuffers();
private static native boolean nativeEglSwapInterval(int inverval);
private static native long nglfwSetCharCallback(long window, long ptr);
private static native long nglfwSetCharModsCallback(long window, long ptr);
private static native long nglfwSetCursorEnterCallback(long window, long ptr);
@@ -577,34 +568,25 @@ public class GLFW
throw new UnsupportedOperationException();
}
private static final SharedLibrary GLFW = new SharedLibrary() {
@java.lang.Override
public String getName() {
return "GLFW";
}
private static final SharedLibrary GLFW = Library.loadNative(GLFW.class, "org.lwjgl.glfw", System.getenv("BUNDLE_PATH") + "/PojavLauncher", true);
@Nullable
@java.lang.Override
public String getPath() {
return null;
}
@java.lang.Override
public long getFunctionAddress(ByteBuffer functionName) {
return 1;
}
/** Contains the function pointers loaded from the glfw {@link SharedLibrary}. */
public static final class Functions {
@java.lang.Override
public void free() {
private Functions() {}
}
@java.lang.Override
public long address() {
return 1;
}
};
// Library.loadNative(GLFW.class, "org.lwjgl.glfw", Configuration.GLFW_LIBRARY_NAME.get(Platform.mapLibraryNameBundled("glfw")), true);
/** Function address. */
public static final long
Init = apiGetFunctionAddress(GLFW, "pojavInit"),
CreateContext = apiGetFunctionAddress(GLFW, "pojavCreateContext"),
GetCurrentContext = apiGetFunctionAddress(GLFW, "pojavGetCurrentContext"),
//DetachOnCurrentThread = apiGetFunctionAddress(GLFW, "pojavDetachOnCurrentThread"),
MakeContextCurrent = apiGetFunctionAddress(GLFW, "pojavMakeCurrent"),
Terminate = apiGetFunctionAddress(GLFW, "pojavTerminate"),
SwapBuffers = apiGetFunctionAddress(GLFW, "pojavSwapBuffers"),
SwapInterval = apiGetFunctionAddress(GLFW, "pojavSwapInterval");
}
public static SharedLibrary getLibrary() {
return GLFW;
@@ -804,12 +786,13 @@ public class GLFW
return lastCallback;
}
static boolean isGLFWReady;
public static boolean glfwInit() {
if (!isGLFWReady) {
// CallbackBridge.nativeAttachThreadToOther(false, false);
mGLFWInitialTime = (double) System.nanoTime();
isGLFWReady = nativeEglInit();
public static boolean glfwInit() {
if (!isGLFWReady) {
mGLFWInitialTime = (double) System.nanoTime();
long __functionAddress = Functions.Init;
isGLFWReady = invokeI(__functionAddress) != 0;
}
return isGLFWReady;
}
@@ -818,15 +801,17 @@ public class GLFW
mGLFWIsInputReady = false;
CallbackBridge.nativeSetInputReady(false);
nativeEglTerminate();
}
long __functionAddress = Functions.Terminate;
invokeV(__functionAddress);
}
public static void glfwInitHint(int hint, int value) { }
public static void glfwInitHint(int hint, int value) { }
@NativeType("GLFWwindow *")
public static long glfwGetCurrentContext() {
return nativeEglGetCurrentContext();
}
@NativeType("GLFWwindow *")
public static long glfwGetCurrentContext() {
long __functionAddress = Functions.GetCurrentContext;
return invokeP(__functionAddress);
}
public static void glfwGetFramebufferSize(@NativeType("GLFWwindow *") long window, @Nullable @NativeType("int *") IntBuffer width, @Nullable @NativeType("int *") IntBuffer height) {
if (CHECKS) {
@@ -941,20 +926,21 @@ public class GLFW
mGLFWGammaRamp = ramp;
}
public static void glfwMakeContextCurrent(long window) {
//Probably not the best idea to rely on program's internals to share the contexts...
// new Exception("Trace exception").printStackTrace();
nativeEglMakeCurrent(window);
}
public static void glfwSwapBuffers(long window) {
nativeEglSwapBuffers();
}
public static void glfwSwapInterval(int interval) {
nativeEglSwapInterval(interval);
public static void glfwMakeContextCurrent(@NativeType("GLFWwindow *") long window) {
long __functionAddress = Functions.MakeContextCurrent;
invokePV(window, __functionAddress);
}
public static void glfwSwapBuffers(@NativeType("GLFWwindow *") long window) {
long __functionAddress = Functions.SwapBuffers;
invokePV(window, __functionAddress);
}
public static void glfwSwapInterval(int interval) {
long __functionAddress = Functions.SwapInterval;
invokeV(interval, __functionAddress);
}
// private static double mTime = 0d;
public static double glfwGetTime() {
// Boardwalk: just use system timer
@@ -975,28 +961,27 @@ public class GLFW
return 60;
}
// GLFW Window functions
// GLFW Window functions
public static long nglfwCreateContext(long share) {
return invokePP(share, Functions.CreateContext);
}
public static long glfwCreateWindow(int width, int height, CharSequence title, long monitor, long share) {
EventLoop.OffScreen.check();
// Create an ACTUAL EGL context
long ptr = nativeEglCreateContext(share);
// Create an ACTUAL EGL context
long ptr = nglfwCreateContext(share);
//nativeEglMakeCurrent(ptr);
GLFWWindowProperties win = new GLFWWindowProperties();
GLFWWindowProperties win = new GLFWWindowProperties();
win.width = width;
win.height = height;
win.width = width;
win.height = height;
// win.width = mGLFWWindowWidth;
// win.height = mGLFWWindowHeight;
win.title = title;
win.title = title;
mGLFWWindowMap.put(ptr, win);
mainContext = ptr;
return ptr;
mGLFWWindowMap.put(ptr, win);
mainContext = ptr;
return ptr;
//Return our context
}
}
public static void glfwDestroyWindow(long window) {
// Check window exists
@@ -1009,8 +994,8 @@ public class GLFW
public static void glfwGetWindowSize(long window, IntBuffer width, IntBuffer height) {
if (width != null) width.put(internalGetWindow(window).width);
if (height != null) height.put(internalGetWindow(window).height);
}
if (height != null) height.put(internalGetWindow(window).height);
}
public static void glfwSetWindowPos(long window, int x, int y) {
internalGetWindow(window).x = x;
JavaApp/src/main/java/org/lwjgl/opengl/ContextGL.java
+1 -1
View File
@@ -134,7 +134,7 @@ final class ContextGL implements Context {
if(shared_context != null) {
share = shared_context.handle;
}
this.handle = GLFW.nativeEglCreateContext(share);
this.handle = GLFW.nglfwCreateContext(share);
// implementation.create(peer_info, attribList, shared_context != null ? shared_context.handle : null);
/* } catch (LWJGLException e) {
// GLContext.unloadOpenGLLibrary();
JavaApp/src/main/java/org/lwjgl/opengl/GL.java
+9 -15
View File
@@ -90,7 +90,7 @@ public final class GL {
create();
}
}
private static native void nativeRegalMakeCurrent();
private GL() {}
@@ -368,15 +368,15 @@ public final class GL {
GLCapabilities caps = null;
try {
if (System.getenv("RENDERER").startsWith("libgl4es") || isUsingRegal) {
if (System.getenv("POJAV_RENDERER").equals("opengles3_virgl") || System.getenv("POJAV_RENDERER").equals("vulkan_zink")) {
int[] dims = getNativeWidthHeight();
callJPI(GLFW.glfwGetCurrentContext(),getGraphicsBufferAddr(),GL_UNSIGNED_BYTE,dims[0],dims[1],functionProvider.getFunctionAddress("OSMesaMakeCurrent"));
} else if (System.getenv("POJAV_RENDERER").startsWith("opengles")) {
// This fixed framebuffer issue on 1.13+ 64-bit by another making current
GLFW.nativeEglMakeCurrent(GLFW.mainContext);
GLFW.glfwMakeContextCurrent(GLFW.mainContext);
if (isUsingRegal) {
nativeRegalMakeCurrent();
}
} else if (System.getenv("RENDERER").contains("zink")) {
int[] dims = getNativeWidthHeight();
callJPI(GLFW.glfwGetCurrentContext(),getGraphicsBufferAddr(),GL_UNSIGNED_BYTE,dims[0],dims[1],functionProvider.getFunctionAddress("OSMesaMakeCurrent"));
}
// We don't have a current ContextCapabilities when this method is called
@@ -413,16 +413,10 @@ public final class GL {
throw new IllegalStateException("There is no OpenGL context current in the current thread.");
}
try {
APIVersion apiVersion = apiParseVersion(versionString);
APIVersion apiVersion = apiParseVersion(versionString);
majorVersion = apiVersion.major;
minorVersion = apiVersion.minor;
} catch (IllegalArgumentException e) {
e.printStackTrace();
majorVersion = 2;
minorVersion = 1;
}
majorVersion = apiVersion.major;
minorVersion = apiVersion.minor;
}
}