joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

app/headless,app/internal/window: unexport embedded Device fields

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

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-03-02 20:51:28 +01:00
parent fc56d438f3
commit f36ed04380
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/headless/headless_windows.go
+5 -5
View File
@@ -8,7 +8,7 @@ import (
) )
type d3d11Context struct { type d3d11Context struct {
*d3d11.Device dev *d3d11.Device
} }
func newContext() (context, error) { func newContext() (context, error) {
@@ -16,11 +16,11 @@ func newContext() (context, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &d3d11Context{Device: dev}, nil return &d3d11Context{dev: dev}, nil
} }
func (c *d3d11Context) Backend() (backend.Device, error) { func (c *d3d11Context) Backend() (backend.Device, error) {
backend, err := d3d11.NewBackend(c.Device) backend, err := d3d11.NewBackend(c.dev)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -35,6 +35,6 @@ func (c *d3d11Context) ReleaseCurrent() {
} }
func (c *d3d11Context) Release() { func (c *d3d11Context) Release() {
c.Device.Release() c.dev.Release()
c.Device = nil c.dev = nil
} }
app/internal/window/d3d11_windows.go
+12 -12
View File
@@ -8,10 +8,10 @@ import (
) )
type d3d11Context struct { type d3d11Context struct {
win *window win *window
swchain *d3d11.SwapChain swchain *d3d11.SwapChain
fbo *d3d11.Framebuffer fbo *d3d11.Framebuffer
*d3d11.Device dev *d3d11.Device
width, height int width, height int
} }
@@ -29,13 +29,13 @@ func init() {
dev.Release() dev.Release()
return nil, err 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) { func (c *d3d11Context) Backend() (backend.Device, error) {
return d3d11.NewBackend(c.Device) return d3d11.NewBackend(c.dev)
} }
func (c *d3d11Context) Present() error { func (c *d3d11Context) Present() error {
@@ -58,7 +58,7 @@ func (c *d3d11Context) Present() error {
func (c *d3d11Context) MakeCurrent() error { func (c *d3d11Context) MakeCurrent() error {
_, width, height := c.win.HWND() _, width, height := c.win.HWND()
if c.fbo != nil && width == c.width && height == c.height { if c.fbo != nil && width == c.width && height == c.height {
c.BindFramebuffer(c.fbo) c.dev.BindFramebuffer(c.fbo)
return nil return nil
} }
if c.fbo != nil { if c.fbo != nil {
@@ -70,12 +70,12 @@ func (c *d3d11Context) MakeCurrent() error {
} }
c.width = width c.width = width
c.height = height c.height = height
fbo, err := c.swchain.Framebuffer(c.Device) fbo, err := c.swchain.Framebuffer(c.dev)
if err != nil { if err != nil {
return err return err
} }
c.fbo = fbo c.fbo = fbo
c.BindFramebuffer(c.fbo) c.dev.BindFramebuffer(c.fbo)
return nil return nil
} }
@@ -90,10 +90,10 @@ func (c *d3d11Context) Release() {
if c.swchain != nil { if c.swchain != nil {
c.swchain.Release() c.swchain.Release()
} }
if c.Device != nil { if c.dev != nil {
c.Device.Release() c.dev.Release()
} }
c.fbo = nil c.fbo = nil
c.swchain = nil c.swchain = nil
c.Device = nil c.dev = nil
} }