Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

internal/graphicsdriver/opengl: remove CGO in opengl for macOS #2091

Merged
merged 15 commits into from
May 21, 2022
Merged

internal/graphicsdriver/opengl: remove CGO in opengl for macOS #2091

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
60cd957
internal/graphicsdriver/opengl, internal/os/syscall, internal/os/dl: …
TotallyGamerJet May 12, 2022
f952608
internal/graphicsdriver/opengl, internal/os/syscall, internal/os/dl: …
TotallyGamerJet May 12, 2022
7edb82c
internal/graphicsdriver/opengl: remove improper comment
TotallyGamerJet May 12, 2022
1af7d11
internal/os/syscall: fix import statement
TotallyGamerJet May 12, 2022
9bab369
internal/os/syscall: fix assembly name
TotallyGamerJet May 12, 2022
6015ea3
internal/os/syscall, internal/os/dl: add LICENSE comment and add buil…
TotallyGamerJet May 12, 2022
a9f6732
internal/os/dl: remove parameters and return from stubs.go
TotallyGamerJet May 13, 2022
df7bf90
internal/opengl/gl: remove dl and syscall and use purego repo
TotallyGamerJet May 18, 2022
7738c1a
internal/opengl/gl: change return of getProcAddress to uintptr
TotallyGamerJet May 18, 2022
9d049c9
internal/opengl/gl: update argument name and reorder imports
TotallyGamerJet May 19, 2022
e5b3aa6
internal/opengl/gl: add comment to link to OpenGL framework
TotallyGamerJet May 20, 2022
523370c
internal/opengl/gl: dlopen OpenGL framework and use in Dlsym
TotallyGamerJet May 21, 2022
cf1ac2f
internal/opengl/gl: reorder build tags
TotallyGamerJet May 21, 2022
aa0834b
Merge branch 'main' into main
TotallyGamerJet May 21, 2022
de57efc
internal/opengl/gl: reorder build tags again
TotallyGamerJet May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/hajimehoshi/ebiten/v2
go 1.15

require (
github.com/ebiten/purego v0.0.0-20220521023924-36e492b737b8
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220320163800-277f93cfa958
github.com/gofrs/flock v0.8.1
github.com/hajimehoshi/bitmapfont/v2 v2.2.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/ebiten/purego v0.0.0-20220517120555-d5a24be3d13f h1:RuI8DJZnK3C84MN1/A0DM/NIde8dhyvQV8oNFjm7ZIk=
github.com/ebiten/purego v0.0.0-20220517120555-d5a24be3d13f/go.mod h1:639Gr28MPEst8oS4Hzv2YSKteDc3y/5cal9PeUINHQQ=
github.com/ebiten/purego v0.0.0-20220521023924-36e492b737b8 h1:poLXyG4bbBg1xgb/WWXGMquXtZF8GUBIuLeM4qQ9cNw=
github.com/ebiten/purego v0.0.0-20220521023924-36e492b737b8/go.mod h1:639Gr28MPEst8oS4Hzv2YSKteDc3y/5cal9PeUINHQQ=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220320163800-277f93cfa958 h1:TL70PMkdPCt9cRhKTqsm+giRpgrd0IGEj763nNr2VFY=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220320163800-277f93cfa958/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
Expand Down
3 changes: 3 additions & 0 deletions ...csdriver/opengl/gl/conversions_windows.go → .../graphicsdriver/opengl/gl/conversions2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// SPDX-License-Identifier: MIT

//go:build windows || darwin
TotallyGamerJet marked this conversation as resolved.
Show resolved Hide resolved
// +build windows darwin

package gl

import (
Expand Down
4 changes: 2 additions & 2 deletions ...river/opengl/gl/conversions_notwindows.go → ...icsdriver/opengl/gl/conversions_others.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT

//go:build !windows
// +build !windows
//go:build !windows && !darwin
TotallyGamerJet marked this conversation as resolved.
Show resolved Hide resolved
// +build !windows,!darwin

package gl

Expand Down
Loading