diff --git a/cmd/go.mod b/cmd/go.mod index dc851223..f8e71ac7 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -3,7 +3,7 @@ module gioui.org/cmd go 1.13 require ( - gioui.org v0.0.0-20200207203519-d2d495416a91 + gioui.org v0.0.0-20200210172258-ef9459c7fde2 github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 github.com/chromedp/chromedp v0.5.2 golang.org/x/image v0.0.0-20190802002840-cff245a6509b diff --git a/cmd/go.sum b/cmd/go.sum index bf8cc36e..3f780346 100644 --- a/cmd/go.sum +++ b/cmd/go.sum @@ -1,6 +1,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20200207203519-d2d495416a91 h1:wJQ6Js+oyhxj9U+ZePGh+z3E0kr7kuSovHR940He0Xc= -gioui.org v0.0.0-20200207203519-d2d495416a91/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200210172258-ef9459c7fde2 h1:eEXOqOxjMcIxGs6KbEWdu+Dj9lHgvoloeUDj/8Sf6t4= +gioui.org v0.0.0-20200210172258-ef9459c7fde2/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg= diff --git a/example/glfw/main.go b/example/glfw/main.go index b9c503b8..b806a697 100644 --- a/example/glfw/main.go +++ b/example/glfw/main.go @@ -65,7 +65,11 @@ func main() { var queue router.Router gtx := layout.NewContext(&queue) th := material.NewTheme() - gpu, err := gpu.New(f) + backend, err := giogl.NewBackend(f) + if err != nil { + log.Fatal(err) + } + gpu, err := gpu.New(backend) if err != nil { log.Fatal(err) } @@ -177,10 +181,6 @@ func (f *goglFunctions) BindFramebuffer(target giogl.Enum, fb giogl.Framebuffer) gl.BindFramebuffer(uint32(target), uint32(fb.V)) } -func (f *goglFunctions) BindRenderbuffer(target giogl.Enum, rb giogl.Renderbuffer) { - gl.BindRenderbuffer(uint32(target), uint32(rb.V)) -} - func (f *goglFunctions) BindTexture(target giogl.Enum, t giogl.Texture) { gl.BindTexture(uint32(target), uint32(t.V)) } @@ -239,12 +239,6 @@ func (f *goglFunctions) CreateQuery() giogl.Query { return giogl.Query{uint(q)} } -func (f *goglFunctions) CreateRenderbuffer() giogl.Renderbuffer { - var rb uint32 - gl.GenRenderbuffers(1, &rb) - return giogl.Renderbuffer{uint(rb)} -} - func (f *goglFunctions) CreateShader(ty giogl.Enum) giogl.Shader { return giogl.Shader{uint(gl.CreateShader(uint32(ty)))} } @@ -274,11 +268,6 @@ func (f *goglFunctions) DeleteQuery(query giogl.Query) { gl.DeleteQueries(1, &q) } -func (f *goglFunctions) DeleteRenderbuffer(v giogl.Renderbuffer) { - rb := uint32(v.V) - gl.DeleteRenderbuffers(1, &rb) -} - func (f *goglFunctions) DeleteShader(s giogl.Shader) { gl.DeleteShader(uint32(s.V)) } @@ -324,14 +313,6 @@ func (f *goglFunctions) EndQuery(target giogl.Enum) { gl.EndQuery(uint32(target)) } -func (f *goglFunctions) Finish() { - gl.Finish() -} - -func (f *goglFunctions) FramebufferRenderbuffer(target, attachment, renderbuffertarget giogl.Enum, renderbuffer giogl.Renderbuffer) { - gl.FramebufferRenderbuffer(uint32(target), uint32(attachment), uint32(renderbuffertarget), uint32(renderbuffer.V)) -} - func (f *goglFunctions) FramebufferTexture2D(target, attachment, texTarget giogl.Enum, t giogl.Texture, level int) { gl.FramebufferTexture2D(uint32(target), uint32(attachment), uint32(texTarget), uint32(t.V), int32(level)) } @@ -346,18 +327,6 @@ func (f *goglFunctions) GetError() giogl.Enum { return giogl.Enum(gl.GetError()) } -func (f *goglFunctions) GetRenderbufferParameteri(target, pname giogl.Enum) int { - var p [100]int32 - gl.GetRenderbufferParameteriv(uint32(target), uint32(pname), &p[0]) - return int(p[0]) -} - -func (f *goglFunctions) GetFramebufferAttachmentParameteri(target, attachment, pname giogl.Enum) int { - var p [100]int32 - gl.GetFramebufferAttachmentParameteriv(uint32(target), uint32(attachment), uint32(pname), &p[0]) - return int(p[0]) -} - func (f *goglFunctions) GetInteger(pname giogl.Enum) int { var p [100]int32 gl.GetIntegerv(uint32(pname), &p[0]) @@ -427,22 +396,6 @@ func (f *goglFunctions) LinkProgram(p giogl.Program) { gl.LinkProgram(uint32(p.V)) } -func (f *goglFunctions) PixelStorei(pname giogl.Enum, param int32) { - gl.PixelStorei(uint32(pname), param) -} - -func (f *goglFunctions) ReadPixels(x, y, width, height int, format, ty giogl.Enum, data []byte) { - gl.ReadPixels(int32(x), int32(y), int32(width), int32(height), uint32(format), uint32(ty), unsafe.Pointer(&data[0])) -} - -func (f *goglFunctions) RenderbufferStorage(target, internalformat giogl.Enum, width, height int) { - gl.RenderbufferStorage(uint32(target), uint32(internalformat), int32(width), int32(height)) -} - -func (f *goglFunctions) Scissor(x, y, width, height int32) { - gl.Scissor(x, y, width, height) -} - func (f *goglFunctions) ShaderSource(s giogl.Shader, src string) { csources, free := gl.Strs(src + "\x00") gl.ShaderSource(uint32(s.V), 1, csources, nil) @@ -457,10 +410,6 @@ func (f *goglFunctions) TexImage2D(target giogl.Enum, level int, internalFormat gl.TexImage2D(uint32(target), int32(level), int32(internalFormat), int32(width), int32(height), 0, uint32(format), uint32(ty), p) } -func (f *goglFunctions) TexSubImage2D(target giogl.Enum, level int, x, y, width, height int, format, ty giogl.Enum, data []byte) { - gl.TexSubImage2D(uint32(target), int32(level), int32(x), int32(y), int32(width), int32(height), uint32(format), uint32(ty), unsafe.Pointer(&data[0])) -} - func (f *goglFunctions) TexParameteri(target, pname giogl.Enum, param int) { gl.TexParameteri(uint32(target), uint32(pname), int32(param)) } diff --git a/example/go.mod b/example/go.mod index 2f1682de..5be47ef9 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,7 +3,7 @@ module gioui.org/example go 1.13 require ( - gioui.org v0.0.0-20200207203519-d2d495416a91 + gioui.org v0.0.0-20200210172258-ef9459c7fde2 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 github.com/google/go-github/v24 v24.0.1 diff --git a/example/go.sum b/example/go.sum index f7a791f8..c07f2749 100644 --- a/example/go.sum +++ b/example/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20200207203519-d2d495416a91 h1:wJQ6Js+oyhxj9U+ZePGh+z3E0kr7kuSovHR940He0Xc= -gioui.org v0.0.0-20200207203519-d2d495416a91/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200210172258-ef9459c7fde2 h1:eEXOqOxjMcIxGs6KbEWdu+Dj9lHgvoloeUDj/8Sf6t4= +gioui.org v0.0.0-20200210172258-ef9459c7fde2/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=