internal/graphicsdriver/opengl/gl: bug fix: libGL.so might not exist in Steam

Instead, libGL.so.1 might exist. Use LD_LIBRARY_PATH and list the
candidates.

Closes #2523
This commit is contained in:
Hajime Hoshi 2023-01-06 23:55:19 +09:00
parent 2f948f35d0
commit df7b7b731e

View File

@ -21,10 +21,21 @@ package gl
// #include <dlfcn.h> // #include <dlfcn.h>
// #include <stdlib.h> // #include <stdlib.h>
// //
// static const char* libGLName;
// static const char* libGLESName;
//
// static void setLibGLName(const char* name) {
// libGLName = name;
// }
//
// static void setLibGLESName(const char* name) {
// libGLESName = name;
// }
//
// static void* libGL() { // static void* libGL() {
// static void* so; // static void* so;
// if (!so) { // if (!so) {
// so = dlopen("libGL.so", RTLD_LAZY | RTLD_GLOBAL); // so = dlopen(libGLName, RTLD_LAZY | RTLD_GLOBAL);
// } // }
// return so; // return so;
// } // }
@ -32,7 +43,7 @@ package gl
// static void* libGLES() { // static void* libGLES() {
// static void* so; // static void* so;
// if (!so) { // if (!so) {
// so = dlopen("libGLESv2.so", RTLD_LAZY | RTLD_GLOBAL); // so = dlopen(libGLESName, RTLD_LAZY | RTLD_GLOBAL);
// } // }
// return so; // return so;
// } // }
@ -56,11 +67,59 @@ import "C"
import ( import (
"fmt" "fmt"
"os" "os"
"path/filepath"
"runtime" "runtime"
"sort"
"strings" "strings"
"unsafe" "unsafe"
) )
func findLib(libraryPaths []string, libName string) (string, error) {
// Look for a library file. In some environments like Steam, a library with the exactly same name might not exist (#2523).
// For example, libGL.so.1 might exist instead of libGL.so.
for _, dir := range libraryPaths {
libs, err := listLibs(dir, libName)
if err != nil {
return "", err
}
if len(libs) == 0 {
continue
}
// The file names are sorted in the alphabetical order. Use the first item.
// TODO: What is the best version to use?
return filepath.Join(dir, libs[0]), nil
}
// LD_LIBRARY_PATH might be empty. Use the original name.
return libName, nil
}
func listLibs(dir string, prefix string) ([]string, error) {
ents, err := os.ReadDir(dir)
if err != nil {
return nil, err
}
var files []string
for _, ent := range ents {
if ent.IsDir() {
continue
}
if ent.Name() == prefix {
files = append(files, ent.Name())
continue
}
if strings.HasPrefix(ent.Name(), prefix+".") {
files = append(files, ent.Name())
continue
}
}
sort.Strings(files)
return files, nil
}
func (c *defaultContext) init() error { func (c *defaultContext) init() error {
var preferES bool var preferES bool
if runtime.GOOS == "android" { if runtime.GOOS == "android" {
@ -76,14 +135,30 @@ func (c *defaultContext) init() error {
} }
} }
libraryPaths := filepath.SplitList(os.Getenv("LD_LIBRARY_PATH"))
// Try OpenGL first. OpenGL is preferrable as this doesn't cause context losts. // Try OpenGL first. OpenGL is preferrable as this doesn't cause context losts.
if !preferES { if !preferES {
libGLName, err := findLib(libraryPaths, "libGL.so")
if err != nil {
return err
}
// This string is never released.
C.setLibGLName(C.CString(libGLName))
if C.libGL() != nil { if C.libGL() != nil {
return nil return nil
} }
} }
// Try OpenGL ES. // Try OpenGL ES.
libGLESName, err := findLib(libraryPaths, "libGLESv2.so")
if err != nil {
return err
}
// This string is never released.
C.setLibGLESName(C.CString(libGLESName))
if C.libGLES() != nil { if C.libGLES() != nil {
c.isES = true c.isES = true
return nil return nil