Merge pull request #13 from Jacalz/modernise

Modernise the package to our current standards

Author: Jacalz

.github/workflows/analysis.yml

@@ -0,0 +1,43 @@
+name: Static Analysis
+on: [push, pull_request]
+permissions:
+  contents: read
+
+jobs:
+  static_analysis:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - uses: actions/setup-go@v5
+      with:
+        go-version: 'stable'
+
+    - name: Install analysis tools
+      run: |
+        go install golang.org/x/tools/cmd/goimports@latest
+        go install github.com/fzipp/gocyclo/cmd/gocyclo@latest
+        go install honnef.co/go/tools/cmd/staticcheck@latest
+        go install github.com/mattn/goveralls@latest
+        go install lucor.dev/lian@latest
+
+    - name: Get dependencies
+      run: sudo apt-get update && sudo apt-get install libgles2-mesa-dev
+
+    - name: Vet
+      run: go vet ./...
+
+    - name: Goimports
+      run: test -z "$(goimports -e -d . | tee /dev/stderr)"
+
+    - name: Gocyclo
+      run: gocyclo -over 30 .
+
+    - name: Staticcheck
+      run: staticcheck ./...
+
+    - name: Check license of dependencies
+      run: lian -d --allowed="Apache-2.0, BSD-2-Clause, BSD-3-Clause, MIT, ISC" --excluded=github.com/jsummers/[email protected]
+

.github/workflows/tests.yml

@@ -0,0 +1,22 @@
+name: Tests
+on: [push, pull_request]
+permissions:
+  contents: read
+
+jobs:
+  static_analysis:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - uses: actions/setup-go@v5
+      with:
+        go-version: 'stable'
+
+    - name: Get dependencies
+      run: sudo apt-get update && sudo apt-get install libgles2-mesa-dev xvfb
+
+    - name: Test
+      run: xvfb-run go test -race ./...

.travis.yml

@@ -1,4 +1,8 @@
-# gl [![Build Status](https://travis-ci.org/goxjs/gl.svg?branch=master)](https://travis-ci.org/goxjs/gl) [![GoDoc](https://godoc.org/github.com/fyne-io/gl-js?status.svg)](https://godoc.org/github.com/fyne-io/gl-js)
+[![Tests](https://github.com/fyne-io/gl-js/actions/workflows/tests.yml/badge.svg)](https://github.com/fyne-io/gl-js/actions/workflows/tests.yml)
+[![Static Analysis](https://github.com/fyne-io/gl-js/actions/workflows/analysis.yml/badge.svg)](https://github.com/fyne-io/gl-js/actions/workflows/analysis.yml)
+[![GoDoc](https://godoc.org/github.com/fyne-io/gl-js?status.svg)](https://godoc.org/github.com/fyne-io/gl-js)
+
+# GL
 
 Package gl is a Go cross-platform binding for OpenGL, with an OpenGL ES 2-like API.
 
@@ -14,22 +18,19 @@ This is a fork of golang.org/x/mobile/gl package with [CL 8793](https://go-revie
 merged in and Windows support added. This package is fully functional, but may eventually become superceded by
 the new x/mobile/gl plan. It will exist and be fully supported until it can be safely replaced by a better package.
 
-Installation
-------------
+## Installation
 
 ```bash
-go get -u github.com/fyne-io/gl-js/...
-GOARCH=js go get -u -d github.com/fyne-io/gl-js/...
+go get github.com/fyne-io/gl-js
 ```
 
-Usage
------
+## Usage
 
 This OpenGL binding has a ContextWatcher, which implements [glfw.ContextWatcher](https://godoc.org/github.com/goxjs/glfw#ContextWatcher)
 interface. Recommended usage is with github.com/fyne-io/glfw-js package, which accepts a ContextWatcher in its Init, and takes on the responsibility
 of notifying it when context is made current or detached.
 
-```Go
+```go
 if err := glfw.Init(gl.ContextWatcher); err != nil {
 	// Handle error.
 }

README.md

@@ -17,7 +17,7 @@ This is a fork of golang.org/x/mobile/gl package with [CL 8793](https://go-revie
 merged in and Windows support added. This package is fully functional, but may eventually become superceded by
 the new x/mobile/gl plan. It will exist and be fully supported until it can be safely replaced by a better package.
 
-Usage
+## Usage
 
 This OpenGL binding has a ContextWatcher, which implements [glfw.ContextWatcher](https://godoc.org/github.com/goxjs/glfw#ContextWatcher)
 interface. Recommended usage is with github.com/goxjs/glfw package, which accepts a ContextWatcher in its Init, and takes on the responsibility

doc.go

@@ -1,4 +1,4 @@
-// +build !js
+//go:build !js
 
 package gl
 
@@ -330,6 +330,7 @@ func DeleteTexture(v Texture) {
 // DepthFunc sets the function used for depth buffer comparisons.
 //
 // Valid fn values:
+//
 //	NEVER
 //	LESS
 //	EQUAL
@@ -391,7 +392,7 @@ func DrawArrays(mode Enum, first, count int) {
 //
 // http://www.khronos.org/opengles/sdk/docs/man3/html/glDrawElements.xhtml
 func DrawElements(mode Enum, count int, ty Enum, offset int) {
-	gl.DrawElements(uint32(mode), int32(count), uint32(ty), gl.PtrOffset(offset))
+	gl.DrawElementsWithOffset(uint32(mode), int32(count), uint32(ty), uintptr(offset))
 }
 
 // Enable enables various GL capabilities.
@@ -670,6 +671,7 @@ func GetShaderSource(s Shader) string {
 // GetString reports current GL state.
 //
 // Valid name values:
+//
 //	EXTENSIONS
 //	RENDERER
 //	SHADING_LANGUAGE_VERSION
@@ -1215,7 +1217,7 @@ func VertexAttrib4fv(dst Attrib, src []float32) {
 //
 // http://www.khronos.org/opengles/sdk/docs/man3/html/glVertexAttribPointer.xhtml
 func VertexAttribPointer(dst Attrib, size int, ty Enum, normalized bool, stride, offset int) {
-	gl.VertexAttribPointer(uint32(dst.Value), int32(size), uint32(ty), normalized, int32(stride), gl.PtrOffset(offset))
+	gl.VertexAttribPointerWithOffset(uint32(dst.Value), int32(size), uint32(ty), normalized, int32(stride), uintptr(offset))
 }
 
 // Viewport sets the viewport, an affine transformation that

gl_opengl.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ios android
+//go:build ios || android
 
 package gl