Skip to content

Commit e5f9302

Browse files
xlabxlab
authored
Merge pull request #21 from tomas-mraz/master
switch back to original glfw
2 parents 7232238 + 9dc8892 commit e5f9302

File tree

12 files changed

+65
-38
lines changed

12 files changed

+65
-38
lines changed

‎go.mod

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ module github.com/vulkan-go/demos
33
go 1.15
44

55
require (
6+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210311203641-62640a716d48
7+
github.com/stretchr/testify v1.8.0 // indirect
8+
github.com/veandco/go-sdl2 v0.4.5
69
github.com/vulkan-go/asche v0.0.0-20190912134304-d4b318b67e07
7-
github.com/vulkan-go/glfw v0.0.0-20190520160600-32f33e359ff2
8-
github.com/vulkan-go/vulkan v0.0.0-20200123094538-aa511c71e200
10+
github.com/vulkan-go/vulkan v0.0.0-20210402152248-956e3850d8f9
11+
github.com/xlab/android-go v0.0.0-20180723170811-ebf4d6dd1830
12+
github.com/xlab/catcher v0.0.0-20170222110830-4ce3d20cbee2
913
github.com/xlab/closer v0.0.0-20190328110542-03326addb7c2
10-
github.com/xlab/linmath v0.0.0-20170502193301-512668b827be
14+
github.com/xlab/ios-go v0.0.0-20170702230120-5c6163f67cd4
15+
github.com/xlab/linmath v0.0.0-20220922225318-40b6290c3b40
16+
github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5
1117
)

‎go.sum

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,35 @@
1+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210311203641-62640a716d48 h1:QrUfZrT8n72FUuiABt4tbu8PwDnOPAbnj3Mql1UhdRI=
5+
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210311203641-62640a716d48/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
6+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
7+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
9+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
10+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
11+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
12+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
13+
github.com/veandco/go-sdl2 v0.4.5 h1:GFIjMabK7y2XWpr9sGvN7RDKHt7vrA7XPTUW60eOw+Y=
14+
github.com/veandco/go-sdl2 v0.4.5/go.mod h1:OROqMhHD43nT4/i9crJukyVecjPNYYuCofep6SNiAjY=
115
github.com/vulkan-go/asche v0.0.0-20190912134304-d4b318b67e07 h1:QIXP1nx5b+YZt1cKDP5SR/89tRXrLxWslBBFBvH/+Y0=
216
github.com/vulkan-go/asche v0.0.0-20190912134304-d4b318b67e07/go.mod h1:fIbNY6YffQRtdF22h26OXRprI/BGOWPKlxJWtNC78OA=
3-
github.com/vulkan-go/glfw v0.0.0-20190520160600-32f33e359ff2 h1:jPnSXM1EM+6J1MbKbUZvQWkuS6Z9lPWRxTHn1NPsyNY=
4-
github.com/vulkan-go/glfw v0.0.0-20190520160600-32f33e359ff2/go.mod h1:qui9jo5J26j9fXv2x3bySGThxYkQZt4SgsPIZRtZAbQ=
5-
github.com/vulkan-go/vulkan v0.0.0-20200123094538-aa511c71e200 h1:Gd8JCplUKwEoAx/9s/zL9DQzNdxmWidxd2uM4zVpURw=
6-
github.com/vulkan-go/vulkan v0.0.0-20200123094538-aa511c71e200/go.mod h1:X6Qqg0j5A5cYHhFXUOl6TL/vYdyh/ajvyCvh+sEHQFI=
17+
github.com/vulkan-go/vulkan v0.0.0-20210402152248-956e3850d8f9 h1:WFujQpkMAAd8dqccEm10n8dly4yQ/R5d2+Us7GutowA=
18+
github.com/vulkan-go/vulkan v0.0.0-20210402152248-956e3850d8f9/go.mod h1:Y5Ti1uUBdKDsb0W8aPtIo9krs+29Y7p6Bc9yyy4AM6g=
19+
github.com/xlab/android-go v0.0.0-20180723170811-ebf4d6dd1830 h1:t4JWwVd06FAAZiTLSIGzNtOQYXkX90Y3bXWwAXvjepk=
20+
github.com/xlab/android-go v0.0.0-20180723170811-ebf4d6dd1830/go.mod h1:cX5Ob29gFddv5hlAJN3tmNcvHuNQwUXzIP06azWW1M8=
21+
github.com/xlab/catcher v0.0.0-20170222110830-4ce3d20cbee2 h1:Zpa3je19AZ1GU/UIgDO+87Vwa0+awqbpKprjfBb+So8=
22+
github.com/xlab/catcher v0.0.0-20170222110830-4ce3d20cbee2/go.mod h1:wLwj0uiLs18rq5dVL7qeTy8ZQsraFHXqas1pUVTa+8A=
723
github.com/xlab/closer v0.0.0-20190328110542-03326addb7c2 h1:LPYwXwwHigHHFX3SFa9W9zBIa5reyaLJos2e95eHh68=
824
github.com/xlab/closer v0.0.0-20190328110542-03326addb7c2/go.mod h1:Y8IYP9aVODN3Vnw1FCqygCG5IWyYBeBlZqQ5aX+fHFw=
9-
github.com/xlab/linmath v0.0.0-20170502193301-512668b827be h1:J/lWrXhpS1n3HRy18iqZnIhQqGSrvKnXQpVRNG5rKqM=
10-
github.com/xlab/linmath v0.0.0-20170502193301-512668b827be/go.mod h1:fgIYDv0Jdzzt+7Us/LdHhBL5N7xqDoj7Jgyf9da1mH4=
25+
github.com/xlab/ios-go v0.0.0-20170702230120-5c6163f67cd4 h1:nC+inKdKlu6riC0WEh/QcnkG4i7ZZRcUZ4UWE7D68ik=
26+
github.com/xlab/ios-go v0.0.0-20170702230120-5c6163f67cd4/go.mod h1:bVfZIYlCKXFl/Dumfx9Sbdl7FDGzd0BpWDFXVegToEE=
27+
github.com/xlab/linmath v0.0.0-20220922225318-40b6290c3b40 h1:FmU7+0eD5GaZzxlbNxVMiC7th7/7qHtskrkWt0ltFkU=
28+
github.com/xlab/linmath v0.0.0-20220922225318-40b6290c3b40/go.mod h1:W1rLjlRa7JX2fcoZ4tb3ZkxuwI6pEX/JkDLPxe1/R1g=
29+
github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5 h1:gmD7q6cCJfBbcuobWQe/KzLsd9Cd3amS1Mq5f3uU1qo=
30+
github.com/xlab/tablewriter v0.0.0-20160610135559-80b567a11ad5/go.mod h1:fVwOndYN3s5IaGlMucfgxwMhqwcaJtlGejBU6zX6Yxw=
31+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
32+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
33+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
34+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
35+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎vulkancube/vulkancube_glfw/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
as "github.com/vulkan-go/asche"
99
"github.com/vulkan-go/demos/vulkancube"
10-
"github.com/vulkan-go/glfw/v3.3/glfw"
10+
"github.com/go-gl/glfw/v3.3/glfw"
1111
vk "github.com/vulkan-go/vulkan"
1212
"github.com/xlab/closer"
1313
)
@@ -89,6 +89,7 @@ func main() {
8989
app := NewApplication(true)
9090
reqDim := app.VulkanSwapchainDimensions()
9191
glfw.WindowHint(glfw.ClientAPI, glfw.NoAPI)
92+
glfw.WindowHint(glfw.Resizable, glfw.False)
9293
window, err := glfw.CreateWindow(int(reqDim.Width), int(reqDim.Height), "VulkanCube (GLFW)", nil, nil)
9394
orPanic(err)
9495
app.windowHandle = window

‎vulkancube/vulkancube_sdl2/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (a *Application) VulkanSurface(instance vk.Instance) (surface vk.Surface) {
3030
log.Println("vulkan error:", err)
3131
return vk.NullSurface
3232
}
33-
surf := vk.SurfaceFromPointer(surfPtr)
33+
surf := vk.SurfaceFromPointer(uintptr(surfPtr))
3434
return surf
3535
}
3636

‎vulkandraw/vulkandraw.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,13 @@ func (v *VulkanDeviceInfo) CreateSwapchain() (VulkanSwapchainInfo, error) {
513513
Clipped: vk.False,
514514
}
515515
s.Swapchains = make([]vk.Swapchain, 1)
516-
err = vk.Error(vk.CreateSwapchain(v.Device, &swapchainCreateInfo, nil, &s.Swapchains[0]))
516+
err = vk.Error(vk.CreateSwapchain(v.Device, &swapchainCreateInfo, nil, &(s.Swapchains[0])))
517517
if err != nil {
518518
err = fmt.Errorf("vk.CreateSwapchain failed with %s", err)
519519
return s, err
520520
}
521521
s.SwapchainLen = make([]uint32, 1)
522-
err = vk.Error(vk.GetSwapchainImages(v.Device, s.DefaultSwapchain(), &s.SwapchainLen[0], nil))
522+
err = vk.Error(vk.GetSwapchainImages(v.Device, s.DefaultSwapchain(), &(s.SwapchainLen[0]), nil))
523523
if err != nil {
524524
err = fmt.Errorf("vk.GetSwapchainImages failed with %s", err)
525525
return s, err

‎vulkandraw/vulkandraw_android/Makefile

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
ANDROID_TOOLCHAIN_DIR ?= $(shell pwd)/toolchain
2-
ANDROID_API ?= 21
3-
ANDROID_SYSROOT = $(NDK)/platforms/android-$(ANDROID_API)/arch-arm
1+
OS=linux
2+
ANDROID_API ?= 23
3+
ANDROID_TOOLCHAIN_DIR ?= $(ANDROID_NDK_HOME)/toolchains/llvm/prebuilt/$(OS)-x86_64/bin
44

5-
all: toolchain build apk
6-
7-
toolchain:
8-
$(NDK)/build/tools/make_standalone_toolchain.py \
9-
--api=$(ANDROID_API) --install-dir=$(ANDROID_TOOLCHAIN_DIR) \
10-
--arch=arm --stl libc++
5+
all: build apk
116

127
build:
138
mkdir -p android/jni/lib
14-
CC="$(ANDROID_TOOLCHAIN_DIR)/bin/arm-linux-androideabi-gcc" \
15-
CXX="$(ANDROID_TOOLCHAIN_DIR)/bin/arm-linux-androideabi-g++" \
16-
CGO_CFLAGS="-march=armv7-a" \
9+
CC="$(ANDROID_TOOLCHAIN_DIR)/aarch64-linux-android$(ANDROID_API)-clang" \
10+
CXX="$(ANDROID_TOOLCHAIN_DIR)/aarch64-linux-android$(ANDROID_API)-clang++" \
1711
GOOS=android \
18-
GOARCH=arm \
19-
GOARM=7 \
12+
GOARCH=arm64 \
2013
CGO_ENABLED=1 \
2114
go build -buildmode=c-shared -o android/jni/lib/libvulkandraw.so
2215

‎vulkandraw/vulkandraw_android/android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
android:versionCode="1"
44
android:versionName="1.0">
55

6-
<uses-sdk android:minSdkVersion="21" />
6+
<uses-sdk android:minSdkVersion="23" />
77

88
<application android:label="VulkanDraw" android:hasCode="false">
99
<activity android:name="android.app.NativeActivity"

‎vulkandraw/vulkandraw_android/android/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
all: project build
22

33
build:
4-
ndk-build
54
ant debug
65

76
install:
8-
ndk-build
97
ant debug install
108

119
project:
12-
# (required) go get github.com/xlab/android-go/cmd/android-project
10+
# command "android-project" require installation:
11+
# go get github.com/xlab/treeprint
12+
# go get github.com/jawher/mow.cli
13+
# go install github.com/xlab/android-go/cmd/android-project
14+
1315
android-project update --target android-23 --name VulkanDraw --path .
1416

1517
project-n:

‎vulkandraw/vulkandraw_android/android/jni/Application.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
APP_PLATFORM := android-21
2-
APP_ABI := armeabi armeabi-v7a
1+
APP_PLATFORM := android-23
2+
APP_ABI := arm64-v8a

‎vulkandraw/vulkandraw_android/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"log"
55

6-
"github.com/vulkan-go/demos/vulkandraw"
6+
"vulkandraw"
77
vk "github.com/vulkan-go/vulkan"
88
"github.com/xlab/android-go/android"
99
"github.com/xlab/android-go/app"

‎vulkandraw/vulkandraw_glfw/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
"github.com/vulkan-go/demos/vulkandraw"
9-
"github.com/vulkan-go/glfw/v3.3/glfw"
9+
"github.com/go-gl/glfw/v3.3/glfw"
1010
vk "github.com/vulkan-go/vulkan"
1111
"github.com/xlab/closer"
1212
)
@@ -54,7 +54,7 @@ func main() {
5454
}
5555

5656
v, err = vulkandraw.NewVulkanDevice(appInfo,
57-
window.GLFWWindow(),
57+
uintptr(window.Handle()),
5858
window.GetRequiredInstanceExtensions(),
5959
createSurface)
6060
orPanic(err)

‎vulkaninfo/vulkaninfo_desktop/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
"github.com/vulkan-go/demos/vulkaninfo"
5-
"github.com/vulkan-go/glfw/v3.3/glfw"
5+
"github.com/go-gl/glfw/v3.3/glfw"
66
vk "github.com/vulkan-go/vulkan"
77
)
88

@@ -24,7 +24,7 @@ func main() {
2424
orPanic(err)
2525
defer window.Destroy()
2626

27-
vkDevice, err := vulkaninfo.NewVulkanDevice(appInfo, window.GLFWWindow())
27+
vkDevice, err := vulkaninfo.NewVulkanDevice(appInfo, uintptr(window.Handle()))
2828
orPanic(err)
2929
vulkaninfo.PrintInfo(vkDevice)
3030
vkDevice.Destroy()

0 commit comments

Comments
 (0)