joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-08 02:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

app/internal/egl: move EGL interface to its own package

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-11-28 15:03:13 +01:00
parent 9528a6e0d4
commit 99b6ad09e5
8 changed files with 230 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/egl_wayland.go
+10 -9
View File
@@ -9,6 +9,7 @@ import (
"sync"
"unsafe"
"gioui.org/app/internal/egl"
"gioui.org/app/internal/gl"
)
@@ -26,7 +27,7 @@ var eglWindows struct {
windows map[*C.struct_wl_surface]*C.struct_wl_egl_window
}
func (w *window) eglDestroy() {
func (w *window) EGLDestroy() {
surf, _, _ := w.surface()
if surf == nil {
return
@@ -39,14 +40,14 @@ func (w *window) eglDestroy() {
}
}
func (w *window) eglDisplay() _EGLNativeDisplayType {
return _EGLNativeDisplayType(unsafe.Pointer(w.display()))
func (w *window) EGLDisplay() egl.NativeDisplayType {
return egl.NativeDisplayType(unsafe.Pointer(w.display()))
}
func (w *window) eglWindow(visID int) (_EGLNativeWindowType, int, int, error) {
func (w *window) EGLWindow(visID int) (egl.NativeWindowType, int, int, error) {
surf, width, height := w.surface()
if surf == nil {
return nilEGLNativeWindowType, 0, 0, errors.New("wayland: no surface")
return 0, 0, 0, errors.New("wayland: no surface")
}
eglWindows.mu.Lock()
defer eglWindows.mu.Unlock()
@@ -57,16 +58,16 @@ func (w *window) eglWindow(visID int) (_EGLNativeWindowType, int, int, error) {
}
eglWin = C.wl_egl_window_create(surf, C.int(width), C.int(height))
if eglWin == nil {
return nilEGLNativeWindowType, 0, 0, errors.New("wayland: wl_egl_create_window failed")
return 0, 0, 0, errors.New("wayland: wl_egl_create_window failed")
}
eglWindows.windows[surf] = eglWin
}
C.wl_egl_window_resize(eglWin, C.int(width), C.int(height), 0, 0)
return _EGLNativeWindowType(uintptr(unsafe.Pointer(eglWin))), width, height, nil
return egl.NativeWindowType(uintptr(unsafe.Pointer(eglWin))), width, height, nil
}
func (w *window) NewContext() (gl.Context, error) {
return newContext(w)
return egl.NewContext(w)
}
func (w *window) needVSync() bool { return false }
func (w *window) NeedVSync() bool { return false }