From 28fd3ec9e5f67f65ccbe6334111e161e2cbcd8f7 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 9 Jul 2022 15:32:37 +0900 Subject: [PATCH] add the ebitengine version build tags besides the ebiten version Closes #2111 Updates #2190 --- .github/workflows/test.yml | 2 +- doc.go | 8 ++++---- imagedumper_desktop.go | 2 +- .../{debug_ebitendebug.go => debug_ebitenginedebug.go} | 4 ++-- ...bug_notebitendebug.go => debug_notebitenginedebug.go} | 4 ++-- internal/graphicsdriver/opengl/context_notwebgl1.go | 4 ++-- internal/graphicsdriver/opengl/context_webgl1.go | 4 ++-- internal/ui/run_notsinglethread.go | 4 ++-- internal/ui/run_singlethread.go | 9 +++++++-- 9 files changed, 23 insertions(+), 18 deletions(-) rename internal/debug/{debug_ebitendebug.go => debug_ebitenginedebug.go} (90%) rename internal/debug/{debug_notebitendebug.go => debug_notebitenginedebug.go} (89%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72c88d309..18c7f01c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -131,7 +131,7 @@ jobs: run: | # TODO: Add -shuffle=on after agnivade/wasmbrowsertest#23 is fixed. env GOOS=js GOARCH=wasm go test -tags=example -v ./... - env GOOS=js GOARCH=wasm go test -tags=example,ebitenwebgl1 -v ./... + env GOOS=js GOARCH=wasm go test -tags=example,ebitenginewebgl1 -v ./... - name: Install ebitenmobile run: | diff --git a/doc.go b/doc.go index c1cc0a75a..045da06bb 100644 --- a/doc.go +++ b/doc.go @@ -63,7 +63,7 @@ // // `EBITENGINE_INTERNAL_IMAGES_KEY` environment variable specifies the key // to dump all the internal images. This is valid only when the build tag -// 'ebitendebug' is specified. This works only on desktops. +// 'ebitenginedebug' is specified. This works only on desktops. // // `EBITENGINE_GRAPHICS_LIBRARY` environment variable specifies the graphics library. // If the specified graphics library is not available, RunGame returns an error. @@ -82,12 +82,12 @@ // // Build tags // -// `ebitendebug` outputs a log of graphics commands. This is useful to know what happens in Ebitengine. In general, the +// `ebitenginedebug` outputs a log of graphics commands. This is useful to know what happens in Ebitengine. In general, the // number of graphics commands affects the performance of your game. // -// `ebitenwebgl1` forces to use WebGL 1 on browsers. +// `ebitenginewebgl1` forces to use WebGL 1 on browsers. // -// `ebitensinglethread` disables Ebitengine's thread safety to unlock maximum performance. If you use this you will have +// `ebitenginesinglethread` disables Ebitengine's thread safety to unlock maximum performance. If you use this you will have // to manage threads yourself. Functions like IsKeyPressed will no longer be concurrent-safe with this build tag. // They must be called from the main thread or the same goroutine as the given game's callback functions like Update // to RunGame. diff --git a/imagedumper_desktop.go b/imagedumper_desktop.go index 6917c134b..06e077ad7 100644 --- a/imagedumper_desktop.go +++ b/imagedumper_desktop.go @@ -142,7 +142,7 @@ func (i *imageDumper) update() error { i.dumpInternalImagesKey = key } } else { - fmt.Fprintf(os.Stderr, "%s is disabled. Specify a build tag 'ebitendebug' to enable it.\n", envInternalImagesKey) + fmt.Fprintf(os.Stderr, "%s is disabled. Specify a build tag 'ebitenginedebug' to enable it.\n", envInternalImagesKey) } } } diff --git a/internal/debug/debug_ebitendebug.go b/internal/debug/debug_ebitenginedebug.go similarity index 90% rename from internal/debug/debug_ebitendebug.go rename to internal/debug/debug_ebitenginedebug.go index 98a7a30e4..4ddc3b292 100644 --- a/internal/debug/debug_ebitendebug.go +++ b/internal/debug/debug_ebitenginedebug.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitendebug -// +build ebitendebug +//go:build ebitenginedebug || ebitendebug +// +build ebitenginedebug ebitendebug package debug diff --git a/internal/debug/debug_notebitendebug.go b/internal/debug/debug_notebitenginedebug.go similarity index 89% rename from internal/debug/debug_notebitendebug.go rename to internal/debug/debug_notebitenginedebug.go index f92fee52b..63506fa30 100644 --- a/internal/debug/debug_notebitendebug.go +++ b/internal/debug/debug_notebitenginedebug.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitendebug -// +build !ebitendebug +//go:build !ebitenginedebug && !ebitendebug +// +build !ebitenginedebug,!ebitendebug package debug diff --git a/internal/graphicsdriver/opengl/context_notwebgl1.go b/internal/graphicsdriver/opengl/context_notwebgl1.go index b894f10bb..e128bda37 100644 --- a/internal/graphicsdriver/opengl/context_notwebgl1.go +++ b/internal/graphicsdriver/opengl/context_notwebgl1.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !ebitenwebgl1 -// +build !ebitenwebgl1 +//go:build !ebitenginewebgl1 && !ebitenwebgl1 +// +build !ebitenginewebgl1,!ebitenwebgl1 package opengl diff --git a/internal/graphicsdriver/opengl/context_webgl1.go b/internal/graphicsdriver/opengl/context_webgl1.go index 1ce5d57b7..5135c6840 100644 --- a/internal/graphicsdriver/opengl/context_webgl1.go +++ b/internal/graphicsdriver/opengl/context_webgl1.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build ebitenwebgl1 -// +build ebitenwebgl1 +//go:build ebitenginewebgl1 || ebitenwebgl1 +// +build ebitenginewebgl1 ebitenwebgl1 package opengl diff --git a/internal/ui/run_notsinglethread.go b/internal/ui/run_notsinglethread.go index aa5a8f723..32def1457 100644 --- a/internal/ui/run_notsinglethread.go +++ b/internal/ui/run_notsinglethread.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && !ebitensinglethread -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend,!ebitensinglethread +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && !ebitenginesinglethread && !ebitensinglethread +// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend,!ebitenginesinglethread,!ebitensinglethread package ui diff --git a/internal/ui/run_singlethread.go b/internal/ui/run_singlethread.go index 37dfaa3bc..925116ea4 100644 --- a/internal/ui/run_singlethread.go +++ b/internal/ui/run_singlethread.go @@ -12,8 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && ebitensinglethread -// +build !android,!ios,!js,!ebitenginecbackend,!ebitencbackend,ebitensinglethread +//go:build !android && !ios && !js && !ebitenginecbackend && !ebitencbackend && (ebitenginesinglethread || ebitensinglethread) +// +build !android +// +build !ios +// +build !js +// +build !ebitenginecbackend +// +build !ebitencbackend +// +build ebitenginesinglethread ebitensinglethread package ui