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

graphics: Add error checks

Browse Source
This commit is contained in:
Hajime Hoshi 2016-08-03 11:05:10 +09:00
parent 8f1b7a2d0c
commit 0aca79ed0b
2 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
image_test.go
View File

@ -123,27 +123,57 @@ func TestImageComposition(t *testing.T) {
return return
} }
img2.Fill(img2Color) if err := img2.Fill(img2Color); err != nil {
img3.Fill(img3Color) t.Fatal(err)
return
}
if err := img3.Fill(img3Color); err != nil {
t.Fatal(err)
return
}
img_12_3, err := NewImage(w, h, FilterNearest) img_12_3, err := NewImage(w, h, FilterNearest)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
return return
} }
img2.DrawImage(img1, nil) if err := img2.DrawImage(img1, nil); err != nil {
img3.DrawImage(img2, nil) t.Fatal(err)
img_12_3.DrawImage(img3, nil) return
}
if err := img3.DrawImage(img2, nil); err != nil {
t.Fatal(err)
return
}
if err := img_12_3.DrawImage(img3, nil); err != nil {
t.Fatal(err)
return
}
img2.Fill(img2Color) if err := img2.Fill(img2Color); err != nil {
img3.Fill(img3Color) t.Fatal(err)
return
}
if err := img3.Fill(img3Color); err != nil {
t.Fatal(err)
return
}
img_1_23, err := NewImage(w, h, FilterNearest) img_1_23, err := NewImage(w, h, FilterNearest)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
return return
} }
img3.DrawImage(img2, nil) if err := img3.DrawImage(img2, nil); err != nil {
img3.DrawImage(img1, nil) t.Fatal(err)
img_1_23.DrawImage(img3, nil) return
}
if err := img3.DrawImage(img1, nil); err != nil {
t.Fatal(err)
return
}
if err := img_1_23.DrawImage(img3, nil); err != nil {
t.Fatal(err)
return
}
for j := 0; j < h; j++ { for j := 0; j < h; j++ {
for i := 0; i < w; i++ { for i := 0; i < w; i++ {
@ -188,7 +218,10 @@ func TestImageDotByDotInversion(t *testing.T) {
op := &DrawImageOptions{} op := &DrawImageOptions{}
op.GeoM.Rotate(math.Pi) op.GeoM.Rotate(math.Pi)
op.GeoM.Translate(float64(w), float64(h)) op.GeoM.Translate(float64(w), float64(h))
img1.DrawImage(img0, op) if err := img1.DrawImage(img0, op); err != nil {
t.Fatal(err)
return
}
for j := 0; j < h; j++ { for j := 0; j < h; j++ {
for i := 0; i < w; i++ { for i := 0; i < w; i++ {
@ -218,7 +251,10 @@ func TestReplacePixels(t *testing.T) {
return return
} }
img0.ReplacePixels(img.Pix) if err := img0.ReplacePixels(img.Pix); err != nil {
t.Fatal(err)
return
}
for j := 0; j < img0.Bounds().Size().Y; j++ { for j := 0; j < img0.Bounds().Size().Y; j++ {
for i := 0; i < img0.Bounds().Size().X; i++ { for i := 0; i < img0.Bounds().Size().X; i++ {
got := img0.At(i, j) got := img0.At(i, j)
@ -233,7 +269,10 @@ func TestReplacePixels(t *testing.T) {
for i := range p { for i := range p {
p[i] = 0x80 p[i] = 0x80
} }
img0.ReplacePixels(p) if err := img0.ReplacePixels(p); err != nil {
t.Fatal(err)
return
}
for j := 0; j < img0.Bounds().Size().Y; j++ { for j := 0; j < img0.Bounds().Size().Y; j++ {
for i := 0; i < img0.Bounds().Size().X; i++ { for i := 0; i < img0.Bounds().Size().X; i++ {
got := img0.At(i, j) got := img0.At(i, j)
@ -276,10 +315,16 @@ func TestImageCompositeModeLighter(t *testing.T) {
t.Fatal(err) t.Fatal(err)
return return
} }
img1.Fill(color.RGBA{0x01, 0x02, 0x03, 0x04}) if err := img1.Fill(color.RGBA{0x01, 0x02, 0x03, 0x04}); err != nil {
t.Fatal(err)
return
}
op := &DrawImageOptions{} op := &DrawImageOptions{}
op.CompositeMode = CompositeModeLighter op.CompositeMode = CompositeModeLighter
img1.DrawImage(img0, op) if err := img1.DrawImage(img0, op); err != nil {
t.Fatal(err)
return
}
for j := 0; j < img1.Bounds().Size().Y; j++ { for j := 0; j < img1.Bounds().Size().Y; j++ {
for i := 0; i < img1.Bounds().Size().X; i++ { for i := 0; i < img1.Bounds().Size().X; i++ {
got := img1.At(i, j).(color.RGBA) got := img1.At(i, j).(color.RGBA)

4
internal/graphics/command.go
View File

@ -224,7 +224,9 @@ func (c *replacePixelsCommand) Exec(context *opengl.Context, indexOffsetInBytes
// This also happens when a fillCommand precedes a replacePixelsCommand. // This also happens when a fillCommand precedes a replacePixelsCommand.
// TODO: Can we have a better way like optimizing commands? // TODO: Can we have a better way like optimizing commands?
context.Flush() context.Flush()
context.BindTexture(c.dst.texture.native) if err := context.BindTexture(c.dst.texture.native); err != nil {
return err
}
context.TexSubImage2D(c.pixels, c.dst.width, c.dst.height) context.TexSubImage2D(c.pixels, c.dst.width, c.dst.height)
return nil return nil
} }