mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-12 12:08:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

opengl: use fmt.Errorf for error messages

Browse Source
This commit is contained in:
Hajime Hoshi 2016-02-24 23:30:43 +09:00
parent 922f392544
commit 6d5e09ad36
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/graphics/opengl/context.go
View File

@ -137,7 +137,7 @@ func (c *Context) FramebufferPixels(f Framebuffer, width, height int) ([]uint8,
pixels := make([]uint8, 4*width*height) pixels := make([]uint8, 4*width*height)
gl.ReadPixels(pixels, 0, 0, width, height, mgl.RGBA, mgl.UNSIGNED_BYTE) gl.ReadPixels(pixels, 0, 0, width, height, mgl.RGBA, mgl.UNSIGNED_BYTE)
if e := gl.GetError(); e != mgl.NO_ERROR { if e := gl.GetError(); e != mgl.NO_ERROR {
return nil, errors.New(fmt.Sprintf("opengl: glReadPixels: %d", e)) return nil, fmt.Errorf("opengl: glReadPixels: %d", e)
} }
return pixels, nil return pixels, nil
} }
@ -160,18 +160,21 @@ func (c *Context) BindZeroFramebuffer() {
func (c *Context) NewFramebuffer(texture Texture) (Framebuffer, error) { func (c *Context) NewFramebuffer(texture Texture) (Framebuffer, error) {
f := gl.CreateFramebuffer() f := gl.CreateFramebuffer()
if f.Value == 0 {
return Framebuffer{}, errors.New("opengl: creating framebuffer failed: gl.CreateFramebuffer must not return 0")
}
gl.BindFramebuffer(mgl.FRAMEBUFFER, f) gl.BindFramebuffer(mgl.FRAMEBUFFER, f)
gl.FramebufferTexture2D(mgl.FRAMEBUFFER, mgl.COLOR_ATTACHMENT0, mgl.TEXTURE_2D, mgl.Texture(texture), 0) gl.FramebufferTexture2D(mgl.FRAMEBUFFER, mgl.COLOR_ATTACHMENT0, mgl.TEXTURE_2D, mgl.Texture(texture), 0)
s := gl.CheckFramebufferStatus(mgl.FRAMEBUFFER) s := gl.CheckFramebufferStatus(mgl.FRAMEBUFFER)
if s != mgl.FRAMEBUFFER_COMPLETE { if s != mgl.FRAMEBUFFER_COMPLETE {
if s != 0 { if s != 0 {
return Framebuffer{}, errors.New(fmt.Sprintf("opengl: creating framebuffer failed: %v", s)) return Framebuffer{}, fmt.Errorf("opengl: creating framebuffer failed: %v", s)
} }
if e := gl.GetError(); e != mgl.NO_ERROR { if e := gl.GetError(); e != mgl.NO_ERROR {
return Framebuffer{}, errors.New(fmt.Sprintf("opengl: creating framebuffer failed: (glGetError) %d", e)) return Framebuffer{}, fmt.Errorf("opengl: creating framebuffer failed: (glGetError) %d", e)
} }
return Framebuffer{}, errors.New(fmt.Sprintf("opengl: creating framebuffer failed: unknown error")) return Framebuffer{}, fmt.Errorf("opengl: creating framebuffer failed: unknown error")
} }
return Framebuffer(f), nil return Framebuffer(f), nil
@ -182,7 +185,7 @@ func (c *Context) SetViewport(f Framebuffer, width, height int) error {
gl.BindFramebuffer(mgl.FRAMEBUFFER, mgl.Framebuffer(f)) gl.BindFramebuffer(mgl.FRAMEBUFFER, mgl.Framebuffer(f))
if err := gl.CheckFramebufferStatus(mgl.FRAMEBUFFER); err != mgl.FRAMEBUFFER_COMPLETE { if err := gl.CheckFramebufferStatus(mgl.FRAMEBUFFER); err != mgl.FRAMEBUFFER_COMPLETE {
if e := gl.GetError(); e != 0 { if e := gl.GetError(); e != 0 {
return errors.New(fmt.Sprintf("opengl: glBindFramebuffer failed: %d", e)) return fmt.Errorf("opengl: glBindFramebuffer failed: %d", e)
} }
return errors.New("opengl: glBindFramebuffer failed: the context is different?") return errors.New("opengl: glBindFramebuffer failed: the context is different?")
} }
@ -211,7 +214,7 @@ func (c *Context) NewShader(shaderType ShaderType, source string) (Shader, error
v := gl.GetShaderi(s, mgl.COMPILE_STATUS) v := gl.GetShaderi(s, mgl.COMPILE_STATUS)
if v == mgl.FALSE { if v == mgl.FALSE {
log := gl.GetShaderInfoLog(s) log := gl.GetShaderInfoLog(s)
return Shader{}, errors.New(fmt.Sprintf("opengl: shader compile failed: %s", log)) return Shader{}, fmt.Errorf("opengl: shader compile failed: %s", log)
} }
return Shader(s), nil return Shader(s), nil
} }