mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 03:38:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove internal/sync

Browse Source 
nosync package for GopherJS is problematic since nosync's mutex
assumes that Lock call is never duplicated, which is not true in
actual applications.

See also #603.
This commit is contained in:
Hajime Hoshi 2018-05-09 23:41:06 +09:00
parent df048d9bf6
commit 92631e64ed
6 changed files with 4 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inpututil/inpututil.go
View File

@ -19,10 +19,10 @@ package inpututil
import ( import (
"sort" "sort"
"sync"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/internal/hooks" "github.com/hajimehoshi/ebiten/internal/hooks"
"github.com/hajimehoshi/ebiten/internal/sync"
) )
type inputState struct { type inputState struct {

3
internal/clock/clock.go
View File

@ -25,9 +25,8 @@
package clock package clock
import ( import (
"sync"
"time" "time"
"github.com/hajimehoshi/ebiten/internal/sync"
) )
const FPS = 60 const FPS = 60

2
internal/shareable/shareable.go
View File

@ -19,13 +19,13 @@ import (
"image" "image"
"image/color" "image/color"
"runtime" "runtime"
"sync"
"github.com/hajimehoshi/ebiten/internal/affine" "github.com/hajimehoshi/ebiten/internal/affine"
"github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/graphics"
"github.com/hajimehoshi/ebiten/internal/opengl" "github.com/hajimehoshi/ebiten/internal/opengl"
"github.com/hajimehoshi/ebiten/internal/packing" "github.com/hajimehoshi/ebiten/internal/packing"
"github.com/hajimehoshi/ebiten/internal/restorable" "github.com/hajimehoshi/ebiten/internal/restorable"
"github.com/hajimehoshi/ebiten/internal/sync"
) )
type backend struct { type backend struct {

29
internal/sync/sync_js.go
View File

@ -1,29 +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.
// +build js
package sync
import (
"github.com/gopherjs/gopherjs/nosync"
)
type Mutex struct {
nosync.Mutex
}
type RWMutex struct {
nosync.RWMutex
}

29
internal/sync/sync_notjs.go
View File

@ -1,29 +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.
// +build !js
package sync
import (
"sync"
)
type Mutex struct {
sync.Mutex
}
type RWMutex struct {
sync.RWMutex
}

2
text/text.go
View File

@ -21,12 +21,12 @@ import (
"image" "image"
"image/color" "image/color"
"math" "math"
"sync"
"golang.org/x/image/font" "golang.org/x/image/font"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
"github.com/hajimehoshi/ebiten" "github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/internal/sync"
) )
var ( var (