Fix crash when enumerating adapters without an OpenGL ICD

Closes #2591
CaffeineMC · Aug 15, 2024 · ae70bec · ae70bec
1 parent d616178
commit ae70bec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...karounds/java/net/caffeinemc/mods/sodium/client/compatibility/checks/PreLaunchChecks.java b/...karounds/java/net/caffeinemc/mods/sodium/client/compatibility/checks/PreLaunchChecks.java
@@ -116,12 +116,13 @@ private static void showCriticalErrorAndClose(String title, String message, Stri
         for (var adapter : GraphicsAdapterProbe.getAdapters()) {
             if (adapter instanceof D3DKMT.WDDMAdapterInfo wddmAdapterInfo) {
                 @Nullable var driverName = wddmAdapterInfo.getOpenGlIcdName();
-                var driverVersion = wddmAdapterInfo.openglIcdVersion();
 
                 if (driverName == null) {
                     continue;
                 }
 
+                var driverVersion = wddmAdapterInfo.openglIcdVersion();
+
                 // Intel OpenGL ICD for Generation 7 GPUs
                 if (driverName.matches("ig7icd(32|64)")) {
                     // https://www.intel.com/content/www/us/en/support/articles/000005654/graphics.html

diff --git a/...orkarounds/java/net/caffeinemc/mods/sodium/client/platform/windows/api/d3dkmt/D3DKMT.java b/...orkarounds/java/net/caffeinemc/mods/sodium/client/platform/windows/api/d3dkmt/D3DKMT.java
@@ -192,11 +192,11 @@ public record WDDMAdapterInfo(
             @NotNull GraphicsAdapterVendor vendor,
             @NotNull String name,
             int adapterType,
-            String openglIcdFilePath,
-            WindowsFileVersion openglIcdVersion
+            @Nullable String openglIcdFilePath,
+            @Nullable WindowsFileVersion openglIcdVersion
     ) implements GraphicsAdapterInfo {
-        public String getOpenGlIcdName() {
-            return D3DKMT.getOpenGlIcdName(this.name);
+        public @Nullable String getOpenGlIcdName() {
+            return D3DKMT.getOpenGlIcdName(this.openglIcdFilePath);
         }
 
         @Override
@@ -206,6 +206,7 @@ public String toString() {
         }
     }
 
+    // Returns (null) if input is (null).
     private static String getOpenGlIcdName(String path) {
         return FilenameUtils.removeExtension(FilenameUtils.getName(path));
     }