From f36ed043804a98b55a4dc74b23200736ae5de860 Mon Sep 17 00:00:00 2001
From: Elias Naur <mail@eliasnaur.com>
Date: Tue, 2 Mar 2021 20:51:28 +0100
Subject: [PATCH] app/headless,app/internal/window: unexport embedded Device
 fields

There is no need for the fields to be embedded nor exported.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
---
 app/headless/headless_windows.go     | 10 +++++-----
 app/internal/window/d3d11_windows.go | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/headless/headless_windows.go b/app/headless/headless_windows.go
index 843dac6f..a45d1957 100644
--- a/app/headless/headless_windows.go
+++ b/app/headless/headless_windows.go
@@ -8,7 +8,7 @@ import (
 )
 
 type d3d11Context struct {
-	*d3d11.Device
+	dev *d3d11.Device
 }
 
 func newContext() (context, error) {
@@ -16,11 +16,11 @@ func newContext() (context, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &d3d11Context{Device: dev}, nil
+	return &d3d11Context{dev: dev}, nil
 }
 
 func (c *d3d11Context) Backend() (backend.Device, error) {
-	backend, err := d3d11.NewBackend(c.Device)
+	backend, err := d3d11.NewBackend(c.dev)
 	if err != nil {
 		return nil, err
 	}
@@ -35,6 +35,6 @@ func (c *d3d11Context) ReleaseCurrent() {
 }
 
 func (c *d3d11Context) Release() {
-	c.Device.Release()
-	c.Device = nil
+	c.dev.Release()
+	c.dev = nil
 }
diff --git a/app/internal/window/d3d11_windows.go b/app/internal/window/d3d11_windows.go
index c3eec57f..466d0d96 100644
--- a/app/internal/window/d3d11_windows.go
+++ b/app/internal/window/d3d11_windows.go
@@ -8,10 +8,10 @@ import (
 )
 
 type d3d11Context struct {
-	win     *window
-	swchain *d3d11.SwapChain
-	fbo     *d3d11.Framebuffer
-	*d3d11.Device
+	win           *window
+	swchain       *d3d11.SwapChain
+	fbo           *d3d11.Framebuffer
+	dev           *d3d11.Device
 	width, height int
 }
 
@@ -29,13 +29,13 @@ func init() {
 				dev.Release()
 				return nil, err
 			}
-			return &d3d11Context{win: w, Device: dev, swchain: swchain}, nil
+			return &d3d11Context{win: w, dev: dev, swchain: swchain}, nil
 		},
 	})
 }
 
 func (c *d3d11Context) Backend() (backend.Device, error) {
-	return d3d11.NewBackend(c.Device)
+	return d3d11.NewBackend(c.dev)
 }
 
 func (c *d3d11Context) Present() error {
@@ -58,7 +58,7 @@ func (c *d3d11Context) Present() error {
 func (c *d3d11Context) MakeCurrent() error {
 	_, width, height := c.win.HWND()
 	if c.fbo != nil && width == c.width && height == c.height {
-		c.BindFramebuffer(c.fbo)
+		c.dev.BindFramebuffer(c.fbo)
 		return nil
 	}
 	if c.fbo != nil {
@@ -70,12 +70,12 @@ func (c *d3d11Context) MakeCurrent() error {
 	}
 	c.width = width
 	c.height = height
-	fbo, err := c.swchain.Framebuffer(c.Device)
+	fbo, err := c.swchain.Framebuffer(c.dev)
 	if err != nil {
 		return err
 	}
 	c.fbo = fbo
-	c.BindFramebuffer(c.fbo)
+	c.dev.BindFramebuffer(c.fbo)
 	return nil
 }
 
@@ -90,10 +90,10 @@ func (c *d3d11Context) Release() {
 	if c.swchain != nil {
 		c.swchain.Release()
 	}
-	if c.Device != nil {
-		c.Device.Release()
+	if c.dev != nil {
+		c.dev.Release()
 	}
 	c.fbo = nil
 	c.swchain = nil
-	c.Device = nil
+	c.dev = nil
 }