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

opengl: Make Program struct to avoid Get()

Browse Source
This commit is contained in:
Hajime Hoshi 2018-06-22 01:45:25 +09:00
parent 55d832fc63
commit 6c1c60d40d
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
internal/opengl/context_js.go
View File

@ -29,19 +29,21 @@ type (
Texture js.Value Texture js.Value
Framebuffer js.Value Framebuffer js.Value
Shader js.Value Shader js.Value
Program js.Value
Buffer js.Value Buffer js.Value
uniformLocation js.Value uniformLocation js.Value
attribLocation int
programID int
Program struct {
value js.Value
id programID
}
) )
type attribLocation int
type programID int
var InvalidTexture = Texture(js.Null) var InvalidTexture = Texture(js.Null)
func getProgramID(p Program) programID { func getProgramID(p Program) programID {
return programID(js.Value(p).Get("__ebiten_programId").Int()) return p.id
} }
var ( var (
@ -304,26 +306,30 @@ func (c *Context) DeleteShader(s Shader) {
func (c *Context) NewProgram(shaders []Shader) (Program, error) { func (c *Context) NewProgram(shaders []Shader) (Program, error) {
gl := c.gl gl := c.gl
p := gl.Call("createProgram") v := gl.Call("createProgram")
if p == js.Null { if v == js.Null {
return Program(js.Null), errors.New("opengl: glCreateProgram failed") return Program{}, errors.New("opengl: glCreateProgram failed")
} }
p.Set("__ebiten_programId", int(c.lastProgramID))
c.lastProgramID++
for _, shader := range shaders { for _, shader := range shaders {
gl.Call("attachShader", js.Value(p), js.Value(shader)) gl.Call("attachShader", v, js.Value(shader))
} }
gl.Call("linkProgram", js.Value(p)) gl.Call("linkProgram", v)
if !gl.Call("getProgramParameter", js.Value(p), linkStatus).Bool() { if !gl.Call("getProgramParameter", v, linkStatus).Bool() {
return Program(js.Null), errors.New("opengl: program error") return Program{}, errors.New("opengl: program error")
} }
return Program(p), nil
id := c.lastProgramID
c.lastProgramID++
return Program{
value: v,
id: id,
}, nil
} }
func (c *Context) UseProgram(p Program) { func (c *Context) UseProgram(p Program) {
gl := c.gl gl := c.gl
gl.Call("useProgram", js.Value(p)) gl.Call("useProgram", p.value)
} }
func (c *Context) DeleteProgram(p Program) { func (c *Context) DeleteProgram(p Program) {
@ -336,7 +342,7 @@ func (c *Context) DeleteProgram(p Program) {
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.Call("getUniformLocation", js.Value(p), location)) return uniformLocation(gl.Call("getUniformLocation", p.value, location))
} }
func (c *Context) UniformInt(p Program, location string, v int) { func (c *Context) UniformInt(p Program, location string, v int) {
@ -374,7 +380,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.Call("getAttribLocation", js.Value(p), location).Int()) return attribLocation(gl.Call("getAttribLocation", p.value, location).Int())
} }
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) {