Improve ANGLE libraries loading

Attempt to load both libEGL and libGLESv2
JetBrains · Feb 3, 2025 · 490afd3 · 490afd3
1 parent 10492bf
commit 490afd3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/skiko/src/awtMain/cpp/windows/AngleSupport.cc b/skiko/src/awtMain/cpp/windows/AngleSupport.cc
@@ -5,6 +5,16 @@
 #include <EGL/egl.h>
 #include "exceptions_handler.h"
 
+#define THROW_IF_NULL(action)                                               \
+    do {                                                                    \
+        auto __result { action };                                           \
+        if (0 == __result) {                                                \
+            auto __code = GetLastError();                                   \
+            throwJavaRenderExceptionByErrorCode(env, __FUNCTION__, __code); \
+            return;                                                         \
+        }                                                                   \
+    } while ((void)0, 0)
+
 static HINSTANCE AngleEGLLibrary = nullptr;
 
 extern "C" {
@@ -64,27 +74,19 @@ extern "C" {
     }
 
     JNIEXPORT void JNICALL Java_org_jetbrains_skiko_AngleSupport_1jvmKt_loadAngleLibraryWindows(JNIEnv *env, jobject obj) {
-        TCHAR path[MAX_PATH];
-        HMODULE hmodule;
-        if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-                              (LPTSTR) &Java_org_jetbrains_skiko_AngleSupport_1jvmKt_loadAngleLibraryWindows,
-                              &hmodule) == 0) {
-            auto code = GetLastError();
-            throwJavaRenderExceptionByErrorCode(env, __FUNCTION__, code);
-            return;
-        }
-        if (GetModuleFileName(hmodule, path, sizeof(path)) == 0) {
-            auto code = GetLastError();
-            throwJavaRenderExceptionByErrorCode(env, __FUNCTION__, code);
-            return;
-        }
-        PathRemoveFileSpec(path);
-        PathAppend(path, TEXT("libEGL.dll"));
-        AngleEGLLibrary = LoadLibrary(path);
-        if (AngleEGLLibrary == nullptr) {
-            auto code = GetLastError();
-            throwJavaRenderExceptionByErrorCode(env, __FUNCTION__, code);
-        }
+        TCHAR basePath[MAX_PATH] = TEXT("");
+        TCHAR libEGL[MAX_PATH] = TEXT("");
+        TCHAR libGLESv2[MAX_PATH] = TEXT("");
+        HMODULE hmodule = nullptr;
+        THROW_IF_NULL(GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                                        (LPTSTR) &Java_org_jetbrains_skiko_AngleSupport_1jvmKt_loadAngleLibraryWindows,
+                                        &hmodule));
+        THROW_IF_NULL(GetModuleFileName(hmodule, basePath, sizeof(basePath)));
+        THROW_IF_NULL(PathRemoveFileSpec(basePath));
+        THROW_IF_NULL(PathCombine(libEGL, basePath, TEXT("libEGL.dll")));
+        THROW_IF_NULL(PathCombine(libGLESv2, basePath, TEXT("libGLESv2.dll")));
+        THROW_IF_NULL(AngleEGLLibrary = LoadLibrary(libEGL));
+        THROW_IF_NULL(LoadLibrary(libGLESv2));
     }
 }
 

diff --git a/skiko/src/jvmMain/kotlin/org/jetbrains/skiko/AngleSupport.jvm.kt b/skiko/src/jvmMain/kotlin/org/jetbrains/skiko/AngleSupport.jvm.kt
@@ -12,7 +12,12 @@ internal actual fun loadAngleLibrary() {
         when {
             hostOs.isWindows -> {
                 Library.staticLoad()
-                loadAngleLibraryWindows()
+                try {
+                    loadAngleLibraryWindows()
+                }
+                catch (e: Exception) {
+                    throw RenderException("Failed to load ANGLE library: ${e}")
+                }
             }
             else -> Unit
         }