mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

opengl: Remove struct usages to avoid copying (program)

Browse Source
This commit is contained in:
Hajime Hoshi 2018-02-19 01:45:03 +09:00
parent 2fbfd0bdcb
commit c6cf8e5184
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/opengl/context_desktop.go
View File

@ -54,7 +54,7 @@ const (
invalidFramebuffer = (1 << 32) - 1 invalidFramebuffer = (1 << 32) - 1
) )
func (p Program) id() programID { func getProgramID(p Program) programID {
return programID(p) return programID(p)
} }

24
internal/opengl/context_js.go
View File

@ -41,9 +41,7 @@ type Shader struct {
*js.Object *js.Object
} }
type Program struct { type Program interface{}
*js.Object
}
type Buffer struct { type Buffer struct {
*js.Object *js.Object
@ -68,8 +66,8 @@ var (
invalidFramebuffer = Framebuffer{} invalidFramebuffer = Framebuffer{}
) )
func (p Program) id() programID { func getProgramID(p Program) programID {
return programID(p.Get("__ebiten_programId").Int()) return programID(p.(*js.Object).Get("__ebiten_programId").Int())
} }
func init() { func init() {
@ -301,7 +299,7 @@ func (c *Context) NewProgram(shaders []Shader) (Program, error) {
gl := c.gl gl := c.gl
p := gl.CreateProgram() p := gl.CreateProgram()
if p == nil { if p == nil {
return Program{nil}, errors.New("opengl: glCreateProgram failed") return nil, errors.New("opengl: glCreateProgram failed")
} }
p.Set("__ebiten_programId", c.lastProgramID) p.Set("__ebiten_programId", c.lastProgramID)
c.lastProgramID++ c.lastProgramID++
@ -311,27 +309,27 @@ func (c *Context) NewProgram(shaders []Shader) (Program, error) {
} }
gl.LinkProgram(p) gl.LinkProgram(p)
if !gl.GetProgramParameterb(p, gl.LINK_STATUS) { if !gl.GetProgramParameterb(p, gl.LINK_STATUS) {
return Program{nil}, errors.New("opengl: program error") return nil, errors.New("opengl: program error")
} }
return Program{p}, nil return Program(p), nil
} }
func (c *Context) UseProgram(p Program) { func (c *Context) UseProgram(p Program) {
gl := c.gl gl := c.gl
gl.UseProgram(p.Object) gl.UseProgram(p.(*js.Object))
} }
func (c *Context) DeleteProgram(p Program) { func (c *Context) DeleteProgram(p Program) {
gl := c.gl gl := c.gl
if !gl.IsProgram(p.Object) { if !gl.IsProgram(p.(*js.Object)) {
return return
} }
gl.DeleteProgram(p.Object) gl.DeleteProgram(p.(*js.Object))
} }
func (c *Context) getUniformLocationImpl(p Program, location string) uniformLocation { func (c *Context) getUniformLocationImpl(p Program, location string) uniformLocation {
gl := c.gl gl := c.gl
return uniformLocation(gl.GetUniformLocation(p.Object, location)) return uniformLocation(gl.GetUniformLocation(p.(*js.Object), location))
} }
func (c *Context) UniformInt(p Program, location string, v int) { func (c *Context) UniformInt(p Program, location string, v int) {
@ -357,7 +355,7 @@ func (c *Context) UniformFloats(p Program, location string, v []float32) {
func (c *Context) getAttribLocationImpl(p Program, location string) attribLocation { func (c *Context) getAttribLocationImpl(p Program, location string) attribLocation {
gl := c.gl gl := c.gl
return attribLocation(gl.GetAttribLocation(p.Object, location)) return attribLocation(gl.GetAttribLocation(p.(*js.Object), location))
} }
func (c *Context) VertexAttribPointer(p Program, location string, size int, dataType DataType, stride int, offset int) { func (c *Context) VertexAttribPointer(p Program, location string, size int, dataType DataType, stride int, offset int) {

2
internal/opengl/context_mobile.go
View File

@ -53,7 +53,7 @@ var (
invalidFramebuffer = Framebuffer(mgl.Framebuffer{(1 << 32) - 1}) invalidFramebuffer = Framebuffer(mgl.Framebuffer{(1 << 32) - 1})
) )
func (p Program) id() programID { func getProgramID(p Program) programID {
return programID(p.Value) return programID(p.Value)
} }

4
internal/opengl/locationcache.go
View File

@ -29,7 +29,7 @@ func newLocationCache() *locationCache {
} }
func (c *locationCache) GetUniformLocation(context *Context, p Program, location string) uniformLocation { func (c *locationCache) GetUniformLocation(context *Context, p Program, location string) uniformLocation {
id := p.id() id := getProgramID(p)
if _, ok := c.uniformLocationCache[id]; !ok { if _, ok := c.uniformLocationCache[id]; !ok {
c.uniformLocationCache[id] = map[string]uniformLocation{} c.uniformLocationCache[id] = map[string]uniformLocation{}
} }
@ -42,7 +42,7 @@ func (c *locationCache) GetUniformLocation(context *Context, p Program, location
} }
func (c *locationCache) GetAttribLocation(context *Context, p Program, location string) attribLocation { func (c *locationCache) GetAttribLocation(context *Context, p Program, location string) attribLocation {
id := p.id() id := getProgramID(p)
if _, ok := c.attribLocationCache[id]; !ok { if _, ok := c.attribLocationCache[id]; !ok {
c.attribLocationCache[id] = map[string]attribLocation{} c.attribLocationCache[id] = map[string]attribLocation{}
} }