From 067e3c004d6c415dd739e280542852862b698e11 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sat, 26 Jun 2021 17:04:00 +0900 Subject: [PATCH] Remove internal/web --- internal/graphicsdriver/opengl/program.go | 4 +- internal/web/web_js.go | 47 ----------------------- internal/web/web_notjs.go | 26 ------------- 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 internal/web/web_js.go delete mode 100644 internal/web/web_notjs.go diff --git a/internal/graphicsdriver/opengl/program.go b/internal/graphicsdriver/opengl/program.go index 1b2c350c0..4bf6aa246 100644 --- a/internal/graphicsdriver/opengl/program.go +++ b/internal/graphicsdriver/opengl/program.go @@ -16,11 +16,11 @@ package opengl import ( "fmt" + "runtime" "github.com/hajimehoshi/ebiten/v2/internal/driver" "github.com/hajimehoshi/ebiten/v2/internal/graphics" "github.com/hajimehoshi/ebiten/v2/internal/shaderir" - "github.com/hajimehoshi/ebiten/v2/internal/web" ) const floatSizeInBytes = 4 @@ -164,7 +164,7 @@ func (s *openGLState) reset(context *context) error { // On browsers (at least Chrome), buffers are already detached from the context // and must not be deleted by DeleteBuffer. - if !web.IsBrowser() { + if runtime.GOOS != "js" { if !s.arrayBuffer.equal(zeroBuffer) { context.deleteBuffer(s.arrayBuffer) } diff --git a/internal/web/web_js.go b/internal/web/web_js.go deleted file mode 100644 index 2c5edff3d..000000000 --- a/internal/web/web_js.go +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2017 The Ebiten Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package web - -import ( - "strings" - "syscall/js" -) - -func IsBrowser() bool { - return true -} - -var ( - isIOSSafari bool - isAndroidChrome bool -) - -func init() { - nav := js.Global().Get("navigator") - if !nav.Truthy() { - return - } - ua := nav.Get("userAgent") - if !ua.Truthy() { - return - } - userAgent := ua.String() - isIOSSafari = strings.Contains(userAgent, "iPhone") || strings.Contains(userAgent, "iPad") - isAndroidChrome = strings.Contains(userAgent, "Android") && strings.Contains(userAgent, "Chrome") -} - -func IsMobileBrowser() bool { - return isIOSSafari || isAndroidChrome -} diff --git a/internal/web/web_notjs.go b/internal/web/web_notjs.go deleted file mode 100644 index b8e80067a..000000000 --- a/internal/web/web_notjs.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2017 The Ebiten Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//go:build !js -// +build !js - -package web - -func IsBrowser() bool { - return false -} - -func IsMobileBrowser() bool { - return false -}