Skip to content

Commit 3ade399

Browse files
committed
use opengl v4.1
1 parent 983678c commit 3ade399

9 files changed

Lines changed: 18 additions & 14 deletions

File tree

examples/test/glsdf3test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/chewxy/math32"
1818
"github.com/soypat/geometry/ms2"
1919
"github.com/soypat/geometry/ms3"
20-
"github.com/soypat/glgl/v4.6-core/glgl"
20+
"github.com/soypat/glgl/v4.1-core/glgl"
2121
"github.com/soypat/gsdf"
2222
"github.com/soypat/gsdf/forge/threads"
2323
"github.com/soypat/gsdf/glbuild"
@@ -41,7 +41,7 @@ func main() {
4141
func run() error {
4242
_, terminate, err := glgl.InitWithCurrentWindow33(glgl.WindowConfig{
4343
Title: "compute",
44-
Version: [2]int{4, 6},
44+
Version: [2]int{4, 1},
4545
Width: 1,
4646
Height: 1,
4747
})

gleval/gpu.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/chewxy/math32"
1111
"github.com/soypat/geometry/ms2"
1212
"github.com/soypat/geometry/ms3"
13-
"github.com/soypat/glgl/v4.6-core/glgl"
13+
"github.com/soypat/glgl/v4.1-core/glgl"
1414
"github.com/soypat/gsdf/glbuild"
1515
)
1616

@@ -21,7 +21,7 @@ var errZeroInvoc = errors.New("zero or negative workgroup invocation size, Compu
2121
func Init1x1GLFW() (terminate func(), err error) {
2222
_, terminate, err = glgl.InitWithCurrentWindow33(glgl.WindowConfig{
2323
Title: "compute",
24-
Version: [2]int{4, 6},
24+
Version: [2]int{4, 1},
2525
OpenGLProfile: glgl.ProfileCompat,
2626
Width: 1,
2727
Height: 1,

gleval/gpu_cgo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"runtime"
99
"unsafe"
1010

11-
"github.com/go-gl/gl/v4.6-core/gl"
11+
"github.com/go-gl/gl/v4.1-core/gl"
1212
"github.com/soypat/geometry/ms2"
1313
"github.com/soypat/geometry/ms3"
14-
"github.com/soypat/glgl/v4.6-core/glgl"
14+
"github.com/soypat/glgl/v4.1-core/glgl"
1515
"github.com/soypat/gsdf/glbuild"
1616
)
1717

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ require (
99
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71
1010
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20250301202403-da16c1255728
1111
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
12-
github.com/soypat/geometry v0.0.0-20250618223846-196a4c63e8ef
13-
github.com/soypat/glgl v0.0.0-20250512221855-eace9dbeac6b
12+
github.com/soypat/geometry v0.0.0-20250718121518-cc41fcad0ec7
13+
github.com/soypat/glgl v0.0.0-20250930033525-aafa471e3c50
1414
golang.org/x/image v0.22.0
1515
)
1616

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,14 @@ github.com/soypat/geometry v0.0.0-20250508182632-816898eefdf5 h1:e9vdJb+5JWk4Rtn
1818
github.com/soypat/geometry v0.0.0-20250508182632-816898eefdf5/go.mod h1:ks6uGIIvsbkaGB7RBLG8pc2yHYBIxZ1FSRSNPtXPAwY=
1919
github.com/soypat/geometry v0.0.0-20250618223846-196a4c63e8ef h1:7SMdeUipfzssy+Yl06GOVMKpmT1u2ZL/r0nVfGAEMBE=
2020
github.com/soypat/geometry v0.0.0-20250618223846-196a4c63e8ef/go.mod h1:ks6uGIIvsbkaGB7RBLG8pc2yHYBIxZ1FSRSNPtXPAwY=
21+
github.com/soypat/geometry v0.0.0-20250718121518-cc41fcad0ec7 h1:+fKPpSStUmn9WAtq4LDzj3QsbWzdxeUi6EH4rShvH7E=
22+
github.com/soypat/geometry v0.0.0-20250718121518-cc41fcad0ec7/go.mod h1:ks6uGIIvsbkaGB7RBLG8pc2yHYBIxZ1FSRSNPtXPAwY=
2123
github.com/soypat/glgl v0.0.0-20241218113040-663b03b49704 h1:KU+Ofl/VEFFM/uNpDPu+2Ds8RrkJUu21Ef0klG7xK08=
2224
github.com/soypat/glgl v0.0.0-20241218113040-663b03b49704/go.mod h1:1LcEp6XHSMCI91WlJHzl/aW4Bp5v6yQOiYFyjrlk350=
2325
github.com/soypat/glgl v0.0.0-20250512221855-eace9dbeac6b h1:jLkbsOoLch2xE1o0m0jlkaJyoKyk0ajhML/tOKkSVYg=
2426
github.com/soypat/glgl v0.0.0-20250512221855-eace9dbeac6b/go.mod h1:1LcEp6XHSMCI91WlJHzl/aW4Bp5v6yQOiYFyjrlk350=
27+
github.com/soypat/glgl v0.0.0-20250930033525-aafa471e3c50 h1:EKwrMdePenV/wH3ENGZ4GlCBM5iH8f7+tYV9NwKlddc=
28+
github.com/soypat/glgl v0.0.0-20250930033525-aafa471e3c50/go.mod h1:1LcEp6XHSMCI91WlJHzl/aW4Bp5v6yQOiYFyjrlk350=
2529
golang.org/x/exp v0.0.0-20221230185412-738e83a70c30 h1:m9O6OTJ627iFnN2JIWfdqlZCzneRO6EEBsHXI25P8ws=
2630
golang.org/x/exp v0.0.0-20221230185412-738e83a70c30/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
2731
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 h1:y5zboxd6LQAqYIhHnB48p0ByQ/GnQx2BE33L8BOHQkI=

gsdf_gpu_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/go-gl/gl/v4.6-core/gl"
14+
"github.com/go-gl/gl/v4.1-core/gl"
1515
"github.com/go-gl/glfw/v3.3/glfw"
16-
"github.com/soypat/glgl/v4.6-core/glgl"
16+
"github.com/soypat/glgl/v4.1-core/glgl"
1717
"github.com/soypat/gsdf/glbuild"
1818
"github.com/soypat/gsdf/gleval"
1919
)

gsdf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/soypat/geometry/ms1"
1717
"github.com/soypat/geometry/ms2"
1818
"github.com/soypat/geometry/ms3"
19-
"github.com/soypat/glgl/v4.6-core/glgl"
19+
"github.com/soypat/glgl/v4.1-core/glgl"
2020
"github.com/soypat/gsdf"
2121
"github.com/soypat/gsdf/glbuild"
2222
"github.com/soypat/gsdf/gleval"

gsdfaux/gsdfaux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"time"
1515

1616
math "github.com/chewxy/math32"
17-
"github.com/soypat/glgl/v4.6-core/glgl"
17+
"github.com/soypat/glgl/v4.1-core/glgl"
1818
"github.com/soypat/gsdf"
1919
"github.com/soypat/gsdf/glbuild"
2020
"github.com/soypat/gsdf/gleval"

gsdfaux/ui.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"math"
1010
"time"
1111

12-
"github.com/go-gl/gl/v4.6-core/gl"
12+
"github.com/go-gl/gl/v4.1-core/gl"
1313
"github.com/go-gl/glfw/v3.3/glfw"
14-
"github.com/soypat/glgl/v4.6-core/glgl"
14+
"github.com/soypat/glgl/v4.1-core/glgl"
1515
"github.com/soypat/gsdf/glbuild"
1616
)
1717

0 commit comments

Comments
 (0)