From 44d2d4a4b4e3c7ea67d0d4ea712d9cc8b10f4939 Mon Sep 17 00:00:00 2001 From: Denis Cheremisov Date: Mon, 8 Feb 2021 02:03:27 +0300 Subject: [PATCH 1/3] fix: making gl thing to compile and work on apple silicon --- internal/driver/glfw/glfw_core.go | 2 +- internal/driver/glfw/glfw_es.go | 1 + internal/painter/gl/gl_core.go | 2 +- internal/painter/gl/gl_es.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/driver/glfw/glfw_core.go b/internal/driver/glfw/glfw_core.go index 8c57655fad..0a7434aa87 100644 --- a/internal/driver/glfw/glfw_core.go +++ b/internal/driver/glfw/glfw_core.go @@ -1,4 +1,4 @@ -// +build !gles,!arm,!arm64 +// +build !gles,!arm,!arm64 arm64,darwin package glfw diff --git a/internal/driver/glfw/glfw_es.go b/internal/driver/glfw/glfw_es.go index afeac02c72..ab9b789491 100644 --- a/internal/driver/glfw/glfw_es.go +++ b/internal/driver/glfw/glfw_es.go @@ -1,4 +1,5 @@ // +build gles arm arm64 +// +build !arm64,!darwin package glfw diff --git a/internal/painter/gl/gl_core.go b/internal/painter/gl/gl_core.go index b7f5e49c48..fa05816f4b 100644 --- a/internal/painter/gl/gl_core.go +++ b/internal/painter/gl/gl_core.go @@ -1,4 +1,4 @@ -// +build !gles,!arm,!arm64,!android,!ios,!mobile +// +build !gles,!arm,!android,!ios,!mobile amr64,darwin package gl diff --git a/internal/painter/gl/gl_es.go b/internal/painter/gl/gl_es.go index 817ffe937a..2f8b576eed 100644 --- a/internal/painter/gl/gl_es.go +++ b/internal/painter/gl/gl_es.go @@ -1,4 +1,4 @@ -// +build gles arm arm64 +// +build gles arm arm64,!darwin // +build !android,!ios,!mobile package gl From 5648e2a7ff6edf7905127d770618f2aeb8c7343b Mon Sep 17 00:00:00 2001 From: Denis Cheremisov Date: Tue, 9 Feb 2021 00:05:14 +0300 Subject: [PATCH 2/3] fix: some boolean algebra applied --- internal/driver/glfw/glfw_es.go | 2 +- internal/painter/gl/gl_core.go | 2 +- internal/painter/gl/gl_es.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/driver/glfw/glfw_es.go b/internal/driver/glfw/glfw_es.go index ab9b789491..0bf16bfe3a 100644 --- a/internal/driver/glfw/glfw_es.go +++ b/internal/driver/glfw/glfw_es.go @@ -1,5 +1,5 @@ // +build gles arm arm64 -// +build !arm64,!darwin +// +build !arm64,darwin arm64,!darwin package glfw diff --git a/internal/painter/gl/gl_core.go b/internal/painter/gl/gl_core.go index fa05816f4b..03fe196719 100644 --- a/internal/painter/gl/gl_core.go +++ b/internal/painter/gl/gl_core.go @@ -1,4 +1,4 @@ -// +build !gles,!arm,!android,!ios,!mobile amr64,darwin +// +build !gles,!arm,!arm64,!android,!ios,!mobile arm64,darwin package gl diff --git a/internal/painter/gl/gl_es.go b/internal/painter/gl/gl_es.go index 2f8b576eed..7e3e1abbc6 100644 --- a/internal/painter/gl/gl_es.go +++ b/internal/painter/gl/gl_es.go @@ -1,5 +1,6 @@ -// +build gles arm arm64,!darwin +// +build gles arm arm64 // +build !android,!ios,!mobile +// +build !arm64,darwin arm64,!darwin package gl From f93d4e04b6275deed1fd8dd515dcf642af3fc9d8 Mon Sep 17 00:00:00 2001 From: Denis Cheremisov Date: Tue, 9 Feb 2021 10:49:31 +0300 Subject: [PATCH 3/3] fix: darwin is pure desktop with gl core to use --- internal/driver/glfw/glfw_core.go | 2 +- internal/driver/glfw/glfw_es.go | 2 +- internal/painter/gl/gl_core.go | 2 +- internal/painter/gl/gl_es.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/driver/glfw/glfw_core.go b/internal/driver/glfw/glfw_core.go index 0a7434aa87..3646b379d9 100644 --- a/internal/driver/glfw/glfw_core.go +++ b/internal/driver/glfw/glfw_core.go @@ -1,4 +1,4 @@ -// +build !gles,!arm,!arm64 arm64,darwin +// +build !gles,!arm,!arm64 darwin package glfw diff --git a/internal/driver/glfw/glfw_es.go b/internal/driver/glfw/glfw_es.go index 0bf16bfe3a..c389c929d5 100644 --- a/internal/driver/glfw/glfw_es.go +++ b/internal/driver/glfw/glfw_es.go @@ -1,5 +1,5 @@ // +build gles arm arm64 -// +build !arm64,darwin arm64,!darwin +// +build !darwin package glfw diff --git a/internal/painter/gl/gl_core.go b/internal/painter/gl/gl_core.go index 03fe196719..8bc92d3e51 100644 --- a/internal/painter/gl/gl_core.go +++ b/internal/painter/gl/gl_core.go @@ -1,4 +1,4 @@ -// +build !gles,!arm,!arm64,!android,!ios,!mobile arm64,darwin +// +build !gles,!arm,!arm64,!android,!ios,!mobile darwin package gl diff --git a/internal/painter/gl/gl_es.go b/internal/painter/gl/gl_es.go index 7e3e1abbc6..5ff64a4f3b 100644 --- a/internal/painter/gl/gl_es.go +++ b/internal/painter/gl/gl_es.go @@ -1,6 +1,6 @@ // +build gles arm arm64 // +build !android,!ios,!mobile -// +build !arm64,darwin arm64,!darwin +// +build !darwin package gl