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

app/internal/srgb: move sRGB emulation to new internal package

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-02-10 16:53:51 +01:00
parent 3ae5a37c24
commit adb950cbf3
11 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/internal/window/gl_ios.go
+2 -2
View File
@@ -22,7 +22,7 @@ import (
type context struct {
owner *window
c gl.Functions
c *glimpl.Functions
ctx C.CFTypeRef
layer C.CFTypeRef
init bool
@@ -50,7 +50,7 @@ func newContext(w *window) (*context, error) {
return c, nil
}
func (c *context) Functions() gl.Functions {
func (c *context) Functions() *glimpl.Functions {
return c.c
}
app/internal/window/gl_js.go
+5 -5
View File
@@ -7,14 +7,14 @@ import (
"syscall/js"
"gioui.org/app/internal/glimpl"
"gioui.org/gpu/gl"
"gioui.org/app/internal/srgb"
)
type context struct {
ctx js.Value
cnv js.Value
f gl.Functions
srgbFBO *gl.SRGBFBO
f *glimpl.Functions
srgbFBO *srgb.SRGBFBO
}
func newContext(w *window) (*context, error) {
@@ -45,7 +45,7 @@ func newContext(w *window) (*context, error) {
return c, nil
}
func (c *context) Functions() gl.Functions {
func (c *context) Functions() *glimpl.Functions {
return c.f
}
@@ -76,7 +76,7 @@ func (c *context) Unlock() {}
func (c *context) MakeCurrent() error {
if c.srgbFBO == nil {
var err error
c.srgbFBO, err = gl.NewSRGBFBO(c.f)
c.srgbFBO, err = srgb.NewSRGBFBO(c.f)
if err != nil {
c.Release()
c.srgbFBO = nil
app/internal/window/gl_macos.go
+2 -3
View File
@@ -6,7 +6,6 @@ package window
import (
"gioui.org/app/internal/glimpl"
"gioui.org/gpu/gl"
)
/*
@@ -19,7 +18,7 @@ import (
import "C"
type context struct {
c gl.Functions
c *glimpl.Functions
ctx C.CFTypeRef
view C.CFTypeRef
}
@@ -41,7 +40,7 @@ func newContext(w *window) (*context, error) {
return c, nil
}
func (c *context) Functions() gl.Functions {
func (c *context) Functions() *glimpl.Functions {
return c.c
}
app/internal/window/window.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"math"
"time"
"gioui.org/gpu/gl"
"gioui.org/app/internal/glimpl"
"gioui.org/io/event"
"gioui.org/io/system"
"gioui.org/unit"
@@ -32,7 +32,7 @@ type Callbacks interface {
}
type Context interface {
Functions() gl.Functions
Functions() *glimpl.Functions
Present() error
MakeCurrent() error
Release()