mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/opengl/gl/: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2023-01-07 17:01:00 +09:00
parent d615c2f42a
commit 847d1cae73
1 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
internal/graphicsdriver/opengl/gl/procaddr_others.go
View File

@ -21,38 +21,19 @@ package gl
// #include <dlfcn.h> // #include <dlfcn.h>
// #include <stdlib.h> // #include <stdlib.h>
// //
// static void* libGLPtr; // static void* getProcAddressGL(void* libGL, const char* name) {
// static void* libGLESPtr;
//
// static void setLibGL(void* lib) {
// libGLPtr = lib;
// }
//
// static void setLibGLES(void* lib) {
// libGLESPtr = lib;
// }
//
// static void* libGL() {
// return libGLPtr;
// }
//
// static void* libGLES() {
// return libGLESPtr;
// }
//
// static void* getProcAddressGL(const char* name) {
// static void*(*glXGetProcAddress)(const char*); // static void*(*glXGetProcAddress)(const char*);
// if (!glXGetProcAddress) { // if (!glXGetProcAddress) {
// glXGetProcAddress = dlsym(libGL(), "glXGetProcAddress"); // glXGetProcAddress = dlsym(libGL, "glXGetProcAddress");
// if (!glXGetProcAddress) { // if (!glXGetProcAddress) {
// glXGetProcAddress = dlsym(libGL(), "glXGetProcAddressARB"); // glXGetProcAddress = dlsym(libGL, "glXGetProcAddressARB");
// } // }
// } // }
// return glXGetProcAddress(name); // return glXGetProcAddress(name);
// } // }
// //
// static void* getProcAddressGLES(const char* name) { // static void* getProcAddressGLES(void* libGLES, const char* name) {
// return dlsym(libGLES(), name); // return dlsym(libGLES, name);
// } // }
import "C" import "C"
@ -66,6 +47,11 @@ import (
"unsafe" "unsafe"
) )
var (
libGL unsafe.Pointer
libGLES unsafe.Pointer
)
// listLibs returns an appropriate library file paths based on the given library paths and the library name as a prefix. // listLibs returns an appropriate library file paths based on the given library paths and the library name as a prefix.
// Note that the found libraries might not be available e.g. due to architecture mismatches. // Note that the found libraries might not be available e.g. due to architecture mismatches.
func listLibs(libraryPaths []string, libName string) ([]string, error) { func listLibs(libraryPaths []string, libName string) ([]string, error) {
@ -147,7 +133,7 @@ func (c *defaultContext) init() error {
lib := C.dlopen(cname, C.RTLD_LAZY|C.RTLD_GLOBAL) lib := C.dlopen(cname, C.RTLD_LAZY|C.RTLD_GLOBAL)
C.free(unsafe.Pointer(cname)) C.free(unsafe.Pointer(cname))
if lib != nil { if lib != nil {
C.setLibGL(lib) libGL = lib
return nil return nil
} }
} }
@ -163,7 +149,7 @@ func (c *defaultContext) init() error {
lib := C.dlopen(cname, C.RTLD_LAZY|C.RTLD_GLOBAL) lib := C.dlopen(cname, C.RTLD_LAZY|C.RTLD_GLOBAL)
C.free(unsafe.Pointer(cname)) C.free(unsafe.Pointer(cname))
if lib != nil { if lib != nil {
C.setLibGLES(lib) libGLES = lib
c.isES = true c.isES = true
return nil return nil
} }
@ -182,12 +168,12 @@ func (c *defaultContext) getProcAddress(name string) unsafe.Pointer {
func getProcAddressGL(name string) unsafe.Pointer { func getProcAddressGL(name string) unsafe.Pointer {
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
return C.getProcAddressGL(cname) return C.getProcAddressGL(libGL, cname)
} }
func getProcAddressGLES(name string) unsafe.Pointer { func getProcAddressGLES(name string) unsafe.Pointer {
name = strings.TrimSuffix(name, "EXT") name = strings.TrimSuffix(name, "EXT")
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
return C.getProcAddressGLES(cname) return C.getProcAddressGLES(libGLES, cname)
} }