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

fix in-game scale zink crash

This commit is contained in:
ShirosakiMio 2024-04-06 09:54:56 +08:00
parent fa92cc28d8
commit c618621825
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FCLauncher/src/main/jni/glfw/include/internal.h
View File

@ -24,6 +24,8 @@
// distribution. // distribution.
// //
//======================================================================== //========================================================================
#ifndef INTERNAL_H
#define INTERNAL_H
#pragma once #pragma once
@ -767,3 +769,4 @@ char* _glfw_strdup(const char* source);
float _glfw_fminf(float a, float b); float _glfw_fminf(float a, float b);
float _glfw_fmaxf(float a, float b); float _glfw_fmaxf(float a, float b);
#endif

12
FCLauncher/src/main/jni/glfw/osmesa_context.c
View File

@ -81,7 +81,8 @@ static void makeContextCurrentOSMesa(_GLFWwindow* window)
window->context.Clear = (PFNGLCLEAR) window->context.getProcAddress("glClear"); window->context.Clear = (PFNGLCLEAR) window->context.getProcAddress("glClear");
window->context.ClearColor = (PFNGLCLEARCOLOR) window->context.getProcAddress("glClearColor"); window->context.ClearColor = (PFNGLCLEARCOLOR) window->context.getProcAddress("glClearColor");
window->context.ReadPixels = (PFNGLREADPIXELS) window->context.getProcAddress("glReadPixels"); window->context.ReadPixels = (PFNGLREADPIXELS) window->context.getProcAddress("glReadPixels");
if (!window->context.Clear || !window->context.ClearColor || !window->context.ReadPixels) { window->context.Finish = (PFNGLFINISH) window->context.getProcAddress("glFinish");
if (!window->context.Clear || !window->context.ClearColor || !window->context.ReadPixels || !window->context.Finish) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Entry point retrieval is broken"); _glfwInputError(GLFW_PLATFORM_ERROR, "Entry point retrieval is broken");
return; return;
} }
@ -121,11 +122,6 @@ static void destroyContextOSMesa(_GLFWwindow* window)
static void swapBuffersOSMesa(_GLFWwindow* window) static void swapBuffersOSMesa(_GLFWwindow* window)
{ {
window->context.Finish = (PFNGLFINISH) window->context.getProcAddress("glFinish");
if (!window->context.Finish) {
_glfwInputError(GLFW_PLATFORM_ERROR, "Entry point retrieval is broken");
return;
}
if (strcmp(getenv("LIBGL_STRING"), "VirGLRenderer") == 0) { if (strcmp(getenv("LIBGL_STRING"), "VirGLRenderer") == 0) {
window->context.Finish(); window->context.Finish();
vtest_swap_buffers(); vtest_swap_buffers();
@ -135,7 +131,9 @@ static void swapBuffersOSMesa(_GLFWwindow* window)
printf("OSMesa: attempted to swap buffers without context!"); printf("OSMesa: attempted to swap buffers without context!");
return; return;
} }
OSMesaMakeCurrent(context, buf.bits, GL_UNSIGNED_BYTE, window->context.osmesa.width, window->context.osmesa.height); OSMesaMakeCurrent(context, buf.bits, GL_UNSIGNED_BYTE, buf.width, buf.height);
if (stride != buf.stride) OSMesaPixelStore(OSMESA_ROW_LENGTH, buf.stride);
stride = buf.stride;
window->context.Finish(); window->context.Finish();
ANativeWindow_unlockAndPost(window->fcl.handle); ANativeWindow_unlockAndPost(window->fcl.handle);
ANativeWindow_lock(window->fcl.handle, &buf, NULL); ANativeWindow_lock(window->fcl.handle, &buf, NULL);