From 91a14c7fa235651187338ab737304a3b1c021077 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sat, 6 Mar 2021 11:03:18 +0100 Subject: [PATCH] app/internal/window: rename "backends" to "drivers" "driver" is the new more specific name for gpu backends. Signed-off-by: Elias Naur --- app/internal/window/d3d11_windows.go | 2 +- app/internal/window/egl_windows.go | 2 +- app/internal/window/os_windows.go | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/internal/window/d3d11_windows.go b/app/internal/window/d3d11_windows.go index 0cec91e9..e2c1a1a7 100644 --- a/app/internal/window/d3d11_windows.go +++ b/app/internal/window/d3d11_windows.go @@ -24,7 +24,7 @@ type d3d11Context struct { const debug = false func init() { - backends = append(backends, gpuAPI{ + drivers = append(drivers, gpuAPI{ priority: 1, initializer: func(w *window) (Context, error) { hwnd, _, _ := w.HWND() diff --git a/app/internal/window/egl_windows.go b/app/internal/window/egl_windows.go index 0f514264..d51e432d 100644 --- a/app/internal/window/egl_windows.go +++ b/app/internal/window/egl_windows.go @@ -12,7 +12,7 @@ type glContext struct { } func init() { - backends = append(backends, gpuAPI{ + drivers = append(drivers, gpuAPI{ priority: 2, initializer: func(w *window) (Context, error) { disp := egl.NativeDisplayType(w.HDC()) diff --git a/app/internal/window/os_windows.go b/app/internal/window/os_windows.go index 16153e46..63ce6aaf 100644 --- a/app/internal/window/os_windows.go +++ b/app/internal/window/os_windows.go @@ -70,9 +70,8 @@ type gpuAPI struct { initializer func(w *window) (Context, error) } -// backends is the list of potential Context -// implementations. -var backends []gpuAPI +// drivers is the list of potential Context implementations. +var drivers []gpuAPI // winMap maps win32 HWNDs to *windows. var winMap sync.Map @@ -483,11 +482,11 @@ func (w *window) destroy() { } func (w *window) NewContext() (Context, error) { - sort.Slice(backends, func(i, j int) bool { - return backends[i].priority < backends[j].priority + sort.Slice(drivers, func(i, j int) bool { + return drivers[i].priority < drivers[j].priority }) var errs []string - for _, b := range backends { + for _, b := range drivers { ctx, err := b.initializer(w) if err == nil { return ctx, nil @@ -497,7 +496,7 @@ func (w *window) NewContext() (Context, error) { if len(errs) > 0 { return nil, fmt.Errorf("NewContext: failed to create a GPU device, tried: %s", strings.Join(errs, ", ")) } - return nil, errors.New("NewContext: no available backends") + return nil, errors.New("NewContext: no available GPU drivers") } func (w *window) ReadClipboard() {