interesting
/
go-opengl-pixel
mirror of https://github.com/faiface/pixel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nicer code

This commit is contained in:
faiface 2016-11-25 22:56:17 +01:00
parent 52a3a96d20
commit c8dba6aaf1
3 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pixelgl/shader.go
View File

@ -21,9 +21,9 @@ func NewShader(parent Doer, vertexShader, fragmentShader string) (*Shader, error
parent: parent, parent: parent,
} }
errChan := make(chan error, 1) var err, glerr error
parent.Do(func() { parent.Do(func() {
err, glerr := DoErrGLErr(func() error { err, glerr = DoErrGLErr(func() error {
var vshader, fshader uint32 var vshader, fshader uint32
// vertex shader // vertex shader
@ -89,31 +89,26 @@ func NewShader(parent Doer, vertexShader, fragmentShader string) (*Shader, error
return nil return nil
}) })
if err != nil {
if glerr != nil {
err = errors.Wrap(glerr, err.Error())
}
errChan <- err
return
}
if glerr != nil {
errChan <- err
return
}
errChan <- nil
}) })
err := <-errChan if err != nil && glerr != nil {
return nil, errors.Wrap(glerr, err.Error())
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
if glerr != nil {
return nil, glerr
}
return shader, nil return shader, nil
} }
// Delete deletes a shader program. Don't use a shader after deletion. // Delete deletes a shader program. Don't use a shader after deletion.
func (s *Shader) Delete() { func (s *Shader) Delete() {
DoNoBlock(func() { s.parent.Do(func() {
gl.DeleteProgram(s.program) DoNoBlock(func() {
gl.DeleteProgram(s.program)
})
}) })
} }

11
pixelgl/texture.go
View File

@ -16,9 +16,9 @@ type Texture struct {
func NewTexture(parent Doer, width, height int, pixels []uint8) (*Texture, error) { func NewTexture(parent Doer, width, height int, pixels []uint8) (*Texture, error) {
texture := &Texture{parent: parent} texture := &Texture{parent: parent}
errChan := make(chan error, 1) var err error
parent.Do(func() { parent.Do(func() {
errChan <- DoGLErr(func() { err = DoGLErr(func() {
gl.GenTextures(1, &texture.tex) gl.GenTextures(1, &texture.tex)
gl.BindTexture(gl.TEXTURE_2D, texture.tex) gl.BindTexture(gl.TEXTURE_2D, texture.tex)
@ -39,7 +39,6 @@ func NewTexture(parent Doer, width, height int, pixels []uint8) (*Texture, error
gl.BindTexture(gl.TEXTURE_2D, 0) gl.BindTexture(gl.TEXTURE_2D, 0)
}) })
}) })
err := <-errChan
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to create a texture") return nil, errors.Wrap(err, "failed to create a texture")
} }
@ -49,8 +48,10 @@ func NewTexture(parent Doer, width, height int, pixels []uint8) (*Texture, error
// Delete deletes a texture. Don't use a texture after deletion. // Delete deletes a texture. Don't use a texture after deletion.
func (t *Texture) Delete() { func (t *Texture) Delete() {
DoNoBlock(func() { t.parent.Do(func() {
gl.DeleteTextures(1, &t.tex) DoNoBlock(func() {
gl.DeleteTextures(1, &t.tex)
})
}) })
} }

18
pixelgl/vertex.go
View File

@ -106,9 +106,9 @@ func NewVertexArray(parent Doer, format VertexFormat, mode VertexDrawMode, usage
mode: mode, mode: mode,
} }
errChan := make(chan error, 1) var err error
parent.Do(func() { parent.Do(func() {
err := DoGLErr(func() { err = DoGLErr(func() {
gl.GenVertexArrays(1, &va.vao) gl.GenVertexArrays(1, &va.vao)
gl.BindVertexArray(va.vao) gl.BindVertexArray(va.vao)
@ -136,13 +136,7 @@ func NewVertexArray(parent Doer, format VertexFormat, mode VertexDrawMode, usage
gl.BindBuffer(gl.ARRAY_BUFFER, 0) gl.BindBuffer(gl.ARRAY_BUFFER, 0)
gl.BindVertexArray(0) gl.BindVertexArray(0)
}) })
if err != nil {
errChan <- err
return
}
errChan <- nil
}) })
err := <-errChan
if err != nil { if err != nil {
return nil, errors.Wrap(err, "failed to create a vertex array") return nil, errors.Wrap(err, "failed to create a vertex array")
} }
@ -152,9 +146,11 @@ func NewVertexArray(parent Doer, format VertexFormat, mode VertexDrawMode, usage
// Delete deletes a vertex array and it's associated vertex buffer. Don't use a vertex array after deletion. // Delete deletes a vertex array and it's associated vertex buffer. Don't use a vertex array after deletion.
func (va *VertexArray) Delete() { func (va *VertexArray) Delete() {
DoNoBlock(func() { va.parent.Do(func() {
gl.DeleteVertexArrays(1, &va.vao) DoNoBlock(func() {
gl.DeleteBuffers(1, &va.vbo) gl.DeleteVertexArrays(1, &va.vao)
gl.DeleteBuffers(1, &va.vbo)
})
}) })
} }