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

app/internal/window,app/internal/gl: move gl.Context to package window

Browse Source 
Package gl now only defines opengl types and functions.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-11-29 19:55:52 +01:00
parent 5fa3dbc70d
commit f25f647a66
11 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/gl/gl.go
-9
View File
@@ -7,15 +7,6 @@ type (
Enum uint
)
type Context interface {
Functions() *Functions
Present() error
MakeCurrent() error
Release()
Lock()
Unlock()
}
const (
ARRAY_BUFFER = 0x8892
BLEND = 0xbe2
app/internal/window/egl_android.go
+1 -2
View File
@@ -11,7 +11,6 @@ import (
"unsafe"
"gioui.org/app/internal/egl"
"gioui.org/app/internal/gl"
)
type context struct {
@@ -19,7 +18,7 @@ type context struct {
*egl.Context
}
func (w *window) NewContext() (gl.Context, error) {
func (w *window) NewContext() (Context, error) {
ctx, err := egl.NewContext(nil)
if err != nil {
return nil, err
app/internal/window/egl_wayland.go
+1 -2
View File
@@ -9,7 +9,6 @@ import (
"unsafe"
"gioui.org/app/internal/egl"
"gioui.org/app/internal/gl"
)
/*
@@ -27,7 +26,7 @@ type context struct {
eglWin *C.struct_wl_egl_window
}
func (w *window) NewContext() (gl.Context, error) {
func (w *window) NewContext() (Context, error) {
disp := egl.NativeDisplayType(unsafe.Pointer(w.display()))
ctx, err := egl.NewContext(disp)
if err != nil {
app/internal/window/egl_windows.go
+1 -2
View File
@@ -6,7 +6,6 @@ import (
"unsafe"
"gioui.org/app/internal/egl"
"gioui.org/app/internal/gl"
)
type context struct {
@@ -14,7 +13,7 @@ type context struct {
*egl.Context
}
func (w *window) NewContext() (gl.Context, error) {
func (w *window) NewContext() (Context, error) {
disp := egl.NativeDisplayType(unsafe.Pointer(w.HDC()))
ctx, err := egl.NewContext(disp)
if err != nil {
app/internal/window/egl_x11.go
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"unsafe"
"gioui.org/app/internal/egl"
"gioui.org/app/internal/gl"
)
type x11Context struct {
@@ -16,7 +15,7 @@ type x11Context struct {
*egl.Context
}
func (w *x11Window) NewContext() (gl.Context, error) {
func (w *x11Window) NewContext() (Context, error) {
disp := egl.NativeDisplayType(unsafe.Pointer(w.display()))
ctx, err := egl.NewContext(disp)
if err != nil {
app/internal/window/gl_ios.go
+1 -1
View File
@@ -121,6 +121,6 @@ func (c *context) MakeCurrent() error {
return nil
}
func (w *window) NewContext() (gl.Context, error) {
func (w *window) NewContext() (Context, error) {
return newContext(w)
}
app/internal/window/gl_js.go
+1 -1
View File
@@ -90,6 +90,6 @@ func (c *context) MakeCurrent() error {
return nil
}
func (w *window) NewContext() (gl.Context, error) {
func (w *window) NewContext() (Context, error) {
return newContext(w)
}
app/internal/window/gl_macos.go
+1 -1
View File
@@ -71,6 +71,6 @@ func (c *context) MakeCurrent() error {
return nil
}
func (w *window) NewContext() (gl.Context, error) {
func (w *window) NewContext() (Context, error) {
return newContext(w)
}
app/internal/window/window.go
+10 -1
View File
@@ -31,6 +31,15 @@ type Callbacks interface {
Event(e event.Event)
}
type Context interface {
Functions() *gl.Functions
Present() error
MakeCurrent() error
Release()
Lock()
Unlock()
}
// Driver is the interface for the platform implementation
// of a window.
type Driver interface {
@@ -39,7 +48,7 @@ type Driver interface {
SetAnimating(anim bool)
// ShowTextInput updates the virtual keyboard state.
ShowTextInput(show bool)
NewContext() (gl.Context, error)
NewContext() (Context, error)
}
type windowRendezvous struct {
app/loop.go
+3 -3
View File
@@ -6,8 +6,8 @@ import (
"image"
"runtime"
"gioui.org/app/internal/gl"
"gioui.org/app/internal/gpu"
"gioui.org/app/internal/window"
"gioui.org/op"
)
@@ -36,7 +36,7 @@ type frameResult struct {
err error
}
func newLoop(ctx gl.Context) (*renderLoop, error) {
func newLoop(ctx window.Context) (*renderLoop, error) {
l := &renderLoop{
frames: make(chan frame),
results: make(chan frameResult),
@@ -54,7 +54,7 @@ func newLoop(ctx gl.Context) (*renderLoop, error) {
return l, nil
}
func (l *renderLoop) renderLoop(glctx gl.Context) error {
func (l *renderLoop) renderLoop(glctx window.Context) error {
// GL Operations must happen on a single OS thread, so
// pass initialization result through a channel.
initErr := make(chan error)
app/window.go
+1 -2
View File
@@ -8,7 +8,6 @@ import (
"image"
"time"
"gioui.org/app/internal/gl"
"gioui.org/app/internal/input"
"gioui.org/app/internal/window"
"gioui.org/io/event"
@@ -285,7 +284,7 @@ func (w *Window) run(opts *window.Options) {
w.loop = nil
}
} else {
var ctx gl.Context
var ctx window.Context
ctx, err = w.driver.NewContext()
if err == nil {
w.loop, err = newLoop(ctx)