mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-10 04:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/directx: fallback to OpenGL when initialization fails

Browse Source 
Closes #2142
This commit is contained in:
Hajime Hoshi 2022-06-17 12:11:29 +09:00
parent 9962fc5ee5
commit 2f84e77e74
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/graphicsdriver/directx/graphics_windows.go
View File

@ -45,7 +45,7 @@ func NewGraphics() (graphicsdriver.Graphics, error) {
}
g := &Graphics{}
if err := g.initializeDevice(); err != nil {
if err := g.initialize(); err != nil {
return nil, err
}
return g, nil
@ -145,7 +145,7 @@ type Graphics struct {
pipelineStates
}
func (g *Graphics) initializeDevice() (ferr error) {
func (g *Graphics) initialize() (ferr error) {
var (
useWARP bool
useDebugLayer bool
@ -161,18 +161,18 @@ func (g *Graphics) initializeDevice() (ferr error) {
}
if microsoftgdk.IsXbox() {
if err := g.initializeDeviceXbox(useWARP, useDebugLayer); err != nil {
if err := g.initializeXbox(useWARP, useDebugLayer); err != nil {
return err
}
} else {
if err := g.initializeDeviceDesktop(useWARP, useDebugLayer); err != nil {
if err := g.initializeDesktop(useWARP, useDebugLayer); err != nil {
return err
}
}
return nil
}
func (g *Graphics) initializeDeviceDesktop(useWARP bool, useDebugLayer bool) (ferr error) {
func (g *Graphics) initializeDesktop(useWARP bool, useDebugLayer bool) (ferr error) {
if err := d3d12.Load(); err != nil {
return err
}
@ -266,10 +266,14 @@ func (g *Graphics) initializeDeviceDesktop(useWARP bool, useDebugLayer bool) (fe
return err
}
if err := g.initializeMembers(); err != nil {
return err
}
return nil
}
func (g *Graphics) initializeDeviceXbox(useWARP bool, useDebugLayer bool) (ferr error) {
func (g *Graphics) initializeXbox(useWARP bool, useDebugLayer bool) (ferr error) {
if err := d3d12x.Load(); err != nil {
return err
}
@ -287,10 +291,14 @@ func (g *Graphics) initializeDeviceXbox(useWARP bool, useDebugLayer bool) (ferr
return err
}
if err := g.initializeMembers(); err != nil {
return err
}
return nil
}
func (g *Graphics) Initialize() (ferr error) {
func (g *Graphics) initializeMembers() (ferr error) {
// Create an event for a fence.
e, err := windows.CreateEvent(nil, 0, 0, nil)
if err != nil {
@ -416,6 +424,11 @@ func (g *Graphics) Initialize() (ferr error) {
return nil
}
func (g *Graphics) Initialize() (err error) {
// Initialization should already be done.
return nil
}
func createBuffer(device *_ID3D12Device, bufferSize uint64, heapType _D3D12_HEAP_TYPE) (*_ID3D12Resource, error) {
state := _D3D12_RESOURCE_STATE_GENERIC_READ()
if heapType == _D3D12_HEAP_TYPE_READBACK {