From 675db373daaf651e16f88fbbf62a58a9e4ecd725 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Tue, 3 Sep 2019 01:47:45 +0900 Subject: [PATCH] Remove driver getters for the playground Unless the driver implementation is finished for the playground, this is confusing. Let's remove this. Updates #871 --- graphicsdriver_opengl.go | 2 +- graphicsdriver_playground.go | 35 ----------------------------------- uidriver_glfw.go | 2 +- uidriver_playground.go | 35 ----------------------------------- 4 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 graphicsdriver_playground.go delete mode 100644 uidriver_playground.go diff --git a/graphicsdriver_opengl.go b/graphicsdriver_opengl.go index d2cca2cf0..1b94e6878 100644 --- a/graphicsdriver_opengl.go +++ b/graphicsdriver_opengl.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build android freebsd ios js linux,cgo windows +// +build android freebsd ios js linux windows // As the Go playground tries to compile this with CGO_ENABLED=0 and GOOS=linux, check Cgo on build tags. diff --git a/graphicsdriver_playground.go b/graphicsdriver_playground.go deleted file mode 100644 index 8a4808f36..000000000 --- a/graphicsdriver_playground.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2019 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. - -// +build !android -// +build !darwin -// +build !freebsd -// +build !ios -// +build !js -// +build !linux,cgo !cgo -// +build !windows - -package graphicsdriver - -import ( - "github.com/hajimehoshi/ebiten/internal/driver" -) - -func graphicsDriver() driver.Graphics { - if !driver.IsPlayground { - panic("ebiten: a graphics driver is not implemented on this environment: isn't cgo disabled?") - } - // TODO: Implement this - return nil -} diff --git a/uidriver_glfw.go b/uidriver_glfw.go index 66a873de4..ae9542b27 100644 --- a/uidriver_glfw.go +++ b/uidriver_glfw.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin freebsd linux,cgo windows +// +build darwin freebsd linux windows // +build !android // +build !ios // +build !js diff --git a/uidriver_playground.go b/uidriver_playground.go deleted file mode 100644 index c03c13131..000000000 --- a/uidriver_playground.go +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2019 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. - -// +build !android -// +build !darwin -// +build !freebsd -// +build !ios -// +build !js -// +build !linux,cgo !cgo -// +build !windows - -package ebiten - -import ( - "github.com/hajimehoshi/ebiten/internal/driver" -) - -func uiDriver() driver.UI { - if !driver.IsPlayground { - panic("ebiten: a UI driver is not implemented on this environment (Cgo is not enabled?)") - } - // TODO: Implement this - return nil -}