support GLES3 from X-Lab

Author: darmie

Diff for: gl_backend.go

@@ -1,9 +1,5 @@
 package nanovgo
 
-import (
-	"github.com/goxjs/gl"
-)
-
 const (
 	nsvgShaderFILLGRAD = iota
 	nsvgShaderFILLIMG
@@ -24,19 +20,19 @@ const (
 
 type glCall struct {
 	callType       glnvgCallType
-	image          int
-	pathOffset     int
-	pathCount      int
-	triangleOffset int
-	triangleCount  int
-	uniformOffset  int
+	image          int32
+	pathOffset     int32
+	pathCount      int32
+	triangleOffset int32
+	triangleCount  int32
+	uniformOffset  int32
 }
 
 type glPath struct {
-	fillOffset   int
-	fillCount    int
-	strokeOffset int
-	strokeCount  int
+	fillOffset   int32
+	fillCount    int32
+	strokeOffset int32
+	strokeCount  int32
 }
 
 type glFragUniforms [44]float32
@@ -108,9 +104,9 @@ func (u *glFragUniforms) setType(typeCode float32) {
 }
 
 type glTexture struct {
-	id            int
-	tex           gl.Texture
-	width, height int
+	id            int32
+	tex           uint32 //gl.Texture
+	width, height int32
 	texType       nvgTextureType
 	flags         ImageFlags
 }

Diff for: gl_struct.go

@@ -2,12 +2,13 @@ package nanovgo
 
 import (
 	"bytes"
-	"github.com/shibukawa/nanovgo/fontstashmini"
 	"image"
 	_ "image/jpeg" // to read jpeg
 	_ "image/png"  // to read png
 	"log"
 	"os"
+
+	"github.com/shibukawa/nanovgo/fontstashmini"
 )
 
 // Context is an entry point object to use NanoVGo API and created by NewContext() function.
@@ -116,12 +117,12 @@ type Context struct {
 	fringeWidth    float32
 	devicePxRatio  float32
 	fs             *fontstashmini.FontStash
-	fontImages     []int
-	fontImageIdx   int
-	drawCallCount  int
-	fillTriCount   int
-	strokeTriCount int
-	textTriCount   int
+	fontImages     []int32
+	fontImageIdx   int32
+	drawCallCount  int32
+	fillTriCount   int32
+	strokeTriCount int32
+	textTriCount   int32
 }
 
 // Delete is called when tearing down NanoVGo context
@@ -144,7 +145,7 @@ func (c *Context) Delete() {
 // For example, GLFW returns two dimension for an opened window: window size and
 // frame buffer size. In that case you would set windowWidth/Height to the window size
 // devicePixelRatio to: frameBufferWidth / windowWidth.
-func (c *Context) BeginFrame(windowWidth, windowHeight int, devicePixelRatio float32) {
+func (c *Context) BeginFrame(windowWidth, windowHeight int32, devicePixelRatio float32) {
 	c.states = c.states[:0]
 	c.Save()
 	c.Reset()
@@ -173,7 +174,7 @@ func (c *Context) EndFrame() {
 		}
 		iw, ih, _ := c.ImageSize(fontImage)
 		j := 0
-		for i := 0; i < c.fontImageIdx; i++ {
+		for i := 0; int32(i) < c.fontImageIdx; i++ {
 			nw, nh, _ := c.ImageSize(c.fontImages[i])
 			if nw < iw || nh < ih {
 				c.DeleteImage(c.fontImages[i])
@@ -369,7 +370,7 @@ func (c *Context) SetFillPaint(paint Paint) {
 
 // CreateImage creates image by loading it from the disk from specified file name.
 // Returns handle to the image.
-func (c *Context) CreateImage(filePath string, flags ImageFlags) int {
+func (c *Context) CreateImage(filePath string, flags ImageFlags) int32 {
 	file, err := os.Open(filePath)
 	defer file.Close()
 	if err != nil {
@@ -384,7 +385,7 @@ func (c *Context) CreateImage(filePath string, flags ImageFlags) int {
 
 // CreateImageFromMemory creates image by loading it from the specified chunk of memory.
 // Returns handle to the image.
-func (c *Context) CreateImageFromMemory(flags ImageFlags, data []byte) int {
+func (c *Context) CreateImageFromMemory(flags ImageFlags, data []byte) int32 {
 	reader := bytes.NewReader(data)
 	img, _, err := image.Decode(reader)
 	if err != nil {
@@ -395,30 +396,30 @@ func (c *Context) CreateImageFromMemory(flags ImageFlags, data []byte) int {
 
 // CreateImageFromGoImage creates image by loading it from the specified image.Image object.
 // Returns handle to the image.
-func (c *Context) CreateImageFromGoImage(imageFlag ImageFlags, img image.Image) int {
+func (c *Context) CreateImageFromGoImage(imageFlag ImageFlags, img image.Image) int32 {
 	bounds := img.Bounds()
 	size := bounds.Size()
 	rgba, ok := img.(*image.RGBA)
 	if ok {
-		return c.CreateImageRGBA(size.X, size.Y, imageFlag, rgba.Pix)
+		return c.CreateImageRGBA(int32(size.X), int32(size.Y), imageFlag, rgba.Pix)
 	}
 	rgba = image.NewRGBA(bounds)
 	for x := 0; x < size.X; x++ {
 		for y := 0; y < size.Y; y++ {
 			rgba.Set(x, y, img.At(x, y))
 		}
 	}
-	return c.CreateImageRGBA(size.X, size.Y, imageFlag, rgba.Pix)
+	return c.CreateImageRGBA(int32(size.X), int32(size.Y), imageFlag, rgba.Pix)
 }
 
 // CreateImageRGBA creates image from specified image data.
 // Returns handle to the image.
-func (c *Context) CreateImageRGBA(w, h int, imageFlags ImageFlags, data []byte) int {
+func (c *Context) CreateImageRGBA(w, h int32, imageFlags ImageFlags, data []byte) int32 {
 	return c.params.renderCreateTexture(nvgTextureRGBA, w, h, imageFlags, data)
 }
 
 // UpdateImage updates image data specified by image handle.
-func (c *Context) UpdateImage(img int, data []byte) error {
+func (c *Context) UpdateImage(img int32, data []byte) error {
 	w, h, err := c.params.renderGetTextureSize(img)
 	if err != nil {
 		return err
@@ -427,12 +428,12 @@ func (c *Context) UpdateImage(img int, data []byte) error {
 }
 
 // ImageSize returns the dimensions of a created image.
-func (c *Context) ImageSize(img int) (int, int, error) {
+func (c *Context) ImageSize(img int32) (int32, int32, error) {
 	return c.params.renderGetTextureSize(img)
 }
 
 // DeleteImage deletes created image.
-func (c *Context) DeleteImage(img int) {
+func (c *Context) DeleteImage(img int32) {
 	c.params.renderDeleteTexture(img)
 }
 
@@ -725,8 +726,8 @@ func (c *Context) Fill() {
 	// Count triangles
 	for i := 0; i < len(c.cache.paths); i++ {
 		path := &c.cache.paths[i]
-		c.fillTriCount += len(path.fills) - 2
-		c.strokeTriCount += len(path.strokes) - 2
+		c.fillTriCount += int32(len(path.fills) - 2)
+		c.strokeTriCount += int32(len(path.strokes) - 2)
 		c.drawCallCount += 2
 	}
 }
@@ -767,7 +768,7 @@ func (c *Context) Stroke() {
 	// Count triangles
 	for i := 0; i < len(c.cache.paths); i++ {
 		path := &c.cache.paths[i]
-		c.strokeTriCount += len(path.strokes) - 2
+		c.strokeTriCount += int32(len(path.strokes) - 2)
 		c.drawCallCount += 2
 	}
 }
@@ -1346,7 +1347,7 @@ func createInternal(params nvgParams) (*Context, error) {
 	context := &Context{
 		params:     params,
 		states:     make([]nvgState, 0, nvgMaxStates),
-		fontImages: make([]int, nvgMaxFontImages),
+		fontImages: make([]int32, nvgMaxFontImages),
 		commands:   make([]float32, 0, nvgInitCommandsSize),
 		cache: nvgPathCache{
 			points:   make([]nvgPoint, 0, nvgInitPointsSize),
@@ -1499,10 +1500,10 @@ func (c *Context) flushTextTexture() {
 		// Update texture
 		if fontImage != 0 {
 			data, _, _ := c.fs.GetTextureData()
-			x := dirty[0]
-			y := dirty[1]
-			w := dirty[2] - x
-			h := dirty[3] - y
+			x := int32(dirty[0])
+			y := int32(dirty[1])
+			w := int32(dirty[2]) - x
+			h := int32(dirty[3]) - y
 			c.params.renderUpdateTexture(fontImage, x, y, w, h, data)
 		}
 	}
@@ -1513,7 +1514,7 @@ func (c *Context) allocTextAtlas() bool {
 	if c.fontImageIdx >= nvgMaxFontImages-1 {
 		return false
 	}
-	var iw, ih int
+	var iw, ih int32
 	// if next fontImage already have a texture
 	if c.fontImages[c.fontImageIdx+1] != 0 {
 		iw, ih, _ = c.ImageSize(c.fontImages[c.fontImageIdx+1])
@@ -1524,14 +1525,14 @@ func (c *Context) allocTextAtlas() bool {
 		} else {
 			iw *= 2
 		}
-		if iw > nvgMaxFontImageSize || ih > nvgMaxFontImageSize {
-			iw = nvgMaxFontImageSize
-			ih = nvgMaxFontImageSize
+		if iw > int32(nvgMaxFontImageSize) || ih > int32(nvgMaxFontImageSize) {
+			iw = int32(nvgMaxFontImageSize)
+			ih = int32(nvgMaxFontImageSize)
 		}
 		c.fontImages[c.fontImageIdx+1] = c.params.renderCreateTexture(nvgTextureALPHA, iw, ih, 0, nil)
 	}
 	c.fontImageIdx++
-	c.fs.ResetAtlas(iw, ih)
+	c.fs.ResetAtlas(int(iw), int(ih))
 	return true
 }
 
@@ -1549,5 +1550,5 @@ func (c *Context) renderText(vertexes []nvgVertex) {
 	c.params.renderTriangleStrip(&paint, &state.scissor, vertexes)
 
 	c.drawCallCount++
-	c.textTriCount += len(vertexes) / 3
+	c.textTriCount += int32(len(vertexes) / 3)
 }

Diff for: nanovgo.go

@@ -13,7 +13,7 @@ type Paint struct {
 	feather    float32
 	innerColor Color
 	outerColor Color
-	image      int
+	image      int32
 }
 
 func (p *Paint) setPaintColor(color Color) {
@@ -89,7 +89,7 @@ func BoxGradient(x, y, w, h, r, f float32, iColor, oColor Color) Paint {
 // ImagePattern creates and returns an image patter. Parameters (ox,oy) specify the left-top location of the image pattern,
 // (ex,ey) the size of one image, angle rotation around the top-left corner, image is handle to the image to render.
 // The gradient is transformed by the current transform when it is passed to Context.FillPaint() or Context.StrokePaint().
-func ImagePattern(cx, cy, w, h, angle float32, img int, alpha float32) Paint {
+func ImagePattern(cx, cy, w, h, angle float32, img int32, alpha float32) Paint {
 	xform := RotateMatrix(angle)
 	xform[4] = cx
 	xform[5] = cy

Diff for: paint.go

@@ -1,5 +1,6 @@
 // +build darwin linux
-// +build arm arm64
+// +build arm arm64 armv7
+// +build android
 
 package nanovgo
 
@@ -16,7 +17,7 @@ var shaderHeader string = `
 #define UNIFORMARRAY_SIZE 11
 `
 
-func prepareTextureBuffer(data []byte, w, h, bpp int) []byte {
+func prepareTextureBuffer(data []byte, w, h, bpp int32) []byte {
 	return data
 }
 

Diff for: platform_mobile.go

@@ -1,13 +1,14 @@
 // +build !arm !arm64
 // +build !js
+// +build !android
 
 package nanovgo
 
 import (
-	"log"
-	"unsafe"
 	"encoding/binary"
+	"log"
 	"math"
+	"unsafe"
 )
 
 type Float float32

Diff for: platform_other.go

@@ -1,11 +1,13 @@
 // +build js
+// +build !android
 
 package nanovgo
 
 import (
 	"encoding/binary"
-	"honnef.co/go/js/console"
 	"math"
+
+	"honnef.co/go/js/console"
 )
 
 var shaderHeader string = `

Diff for: platform_webgl.go

@@ -7,11 +7,11 @@ import (
 type nvgParams interface {
 	edgeAntiAlias() bool
 	renderCreate() error
-	renderCreateTexture(texType nvgTextureType, w, h int, flags ImageFlags, data []byte) int
-	renderDeleteTexture(image int) error
-	renderUpdateTexture(image, x, y, w, h int, data []byte) error
-	renderGetTextureSize(image int) (int, int, error)
-	renderViewport(width, height int)
+	renderCreateTexture(texType nvgTextureType, w, h int32, flags ImageFlags, data []byte) int32
+	renderDeleteTexture(image int32) error
+	renderUpdateTexture(image, x, y, w, h int32, data []byte) error
+	renderGetTextureSize(image int32) (int32, int32, error)
+	renderViewport(width, height int32)
 	renderCancel()
 	renderFlush()
 	renderFill(paint *Paint, scissor *nvgScissor, fringe float32, bounds [4]float32, paths []nvgPath)

Diff for: structs.go

@@ -1,6 +1,8 @@
 package nanovgo
 
 import (
+	"bytes"
+	"encoding/binary"
 	"math"
 )
 
@@ -424,7 +426,7 @@ func roundCapEnd(dst []nvgVertex, index int, p *nvgPoint, dx, dy, w float32, nCa
 	return index
 }
 
-func nearestPow2(num int) int {
+func nearestPow2(num int32) int32 {
 	var n uint
 	uNum := uint(num)
 	if uNum > 0 {
@@ -438,9 +440,15 @@ func nearestPow2(num int) int {
 	n |= n >> 8
 	n |= n >> 16
 	n++
-	return int(num)
+	return int32(num)
 }
 
 func quantize(a, d float32) float32 {
 	return float32(int(a/d+0.5)) * d
 }
+
+func readUint32(data []byte) (ret *uint32) {
+	buf := bytes.NewBuffer(data)
+	binary.Read(buf, binary.LittleEndian, ret)
+	return
+}