From ed88559a5040b9da9116aa9d344fd887cc77116a Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Mon, 21 Nov 2022 02:46:04 +0900 Subject: [PATCH] internal/graphicsdriver/directx: add EBITENGINE_DIRECTX_FEATURE_LEVEL A fix for #2447 was a breaking-change as the DirectX driver was no longer available for some old graphics card. To support such old cards, provide a new environment variable EBITENGINE_DIRECTX_FEATURE_LEVEL to specify a feature level. The possible values are 11_0, 11_1, 12_0, 12_1, and 12_2. The default value is 12_0. Closes #2466 --- doc.go | 4 +++ .../graphicsdriver/directx/api_windows.go | 4 +++ .../directx/graphics_windows.go | 28 +++++++++++++++---- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/doc.go b/doc.go index 3715e4f81..8f219bcb9 100644 --- a/doc.go +++ b/doc.go @@ -81,6 +81,10 @@ // "warp": Use WARP (i.e. software rendering). // "debug": Use a debug layer. // +// `EBITENGINE_DIRECTX_FEATURE_LEVEL` environment variable specifies DirectX feature level. +// The possible values are "11_0", "11_1", "12_0", "12_1", and "12_2". +// The default value is "12_0". +// // # Build tags // // `ebitenginedebug` outputs a log of graphics commands. This is useful to know what happens in Ebitengine. In general, the diff --git a/internal/graphicsdriver/directx/api_windows.go b/internal/graphicsdriver/directx/api_windows.go index eab6c0c75..75961dcad 100644 --- a/internal/graphicsdriver/directx/api_windows.go +++ b/internal/graphicsdriver/directx/api_windows.go @@ -75,7 +75,11 @@ const ( type _D3D_FEATURE_LEVEL int32 const ( + _D3D_FEATURE_LEVEL_11_0 _D3D_FEATURE_LEVEL = 0xb000 + _D3D_FEATURE_LEVEL_11_1 _D3D_FEATURE_LEVEL = 0xb100 _D3D_FEATURE_LEVEL_12_0 _D3D_FEATURE_LEVEL = 0xc000 + _D3D_FEATURE_LEVEL_12_1 _D3D_FEATURE_LEVEL = 0xc100 + _D3D_FEATURE_LEVEL_12_2 _D3D_FEATURE_LEVEL = 0xc200 ) type _D3D_PRIMITIVE_TOPOLOGY int32 diff --git a/internal/graphicsdriver/directx/graphics_windows.go b/internal/graphicsdriver/directx/graphics_windows.go index 41b22ff24..f30d76ee5 100644 --- a/internal/graphicsdriver/directx/graphics_windows.go +++ b/internal/graphicsdriver/directx/graphics_windows.go @@ -181,6 +181,24 @@ func (g *Graphics) initialize() (ferr error) { } } + // Ebitengine itself doesn't require the features level 12 and 11 should be enough, + // but some old cards don't work well (#2447). Specify the level 12 by default. + var featureLevel _D3D_FEATURE_LEVEL = _D3D_FEATURE_LEVEL_12_0 + if env := os.Getenv("EBITENGINE_DIRECTX_FEATURE_LEVEL"); env != "" { + switch env { + case "11_0": + featureLevel = _D3D_FEATURE_LEVEL_11_0 + case "11_1": + featureLevel = _D3D_FEATURE_LEVEL_11_1 + case "12_0": + featureLevel = _D3D_FEATURE_LEVEL_12_0 + case "12_1": + featureLevel = _D3D_FEATURE_LEVEL_12_1 + case "12_2": + featureLevel = _D3D_FEATURE_LEVEL_12_2 + } + } + // Initialize not only a device but also other members like a fence. // Even if initializing a device succeeds, initializing a fence might fail (#2142). @@ -189,7 +207,7 @@ func (g *Graphics) initialize() (ferr error) { return err } } else { - if err := g.initializeDesktop(useWARP, useDebugLayer); err != nil { + if err := g.initializeDesktop(useWARP, useDebugLayer, featureLevel); err != nil { return err } } @@ -197,7 +215,7 @@ func (g *Graphics) initialize() (ferr error) { return nil } -func (g *Graphics) initializeDesktop(useWARP bool, useDebugLayer bool) (ferr error) { +func (g *Graphics) initializeDesktop(useWARP bool, useDebugLayer bool, featureLevel _D3D_FEATURE_LEVEL) (ferr error) { if err := d3d12.Load(); err != nil { return err } @@ -264,9 +282,7 @@ func (g *Graphics) initializeDesktop(useWARP bool, useDebugLayer bool) (ferr err continue } // Test D3D12CreateDevice without creating an actual device. - // Ebitengine itself doesn't require the features level 12 and 11 should be enough, - // but some old cards don't work well (#2447). Specify the level 12 here. - if _, err := _D3D12CreateDevice(unsafe.Pointer(a), _D3D_FEATURE_LEVEL_12_0, &_IID_ID3D12Device, false); err != nil { + if _, err := _D3D12CreateDevice(unsafe.Pointer(a), featureLevel, &_IID_ID3D12Device, false); err != nil { continue } @@ -279,7 +295,7 @@ func (g *Graphics) initializeDesktop(useWARP bool, useDebugLayer bool) (ferr err return errors.New("directx: DirectX 12 is not supported") } - d, err := _D3D12CreateDevice(unsafe.Pointer(adapter), _D3D_FEATURE_LEVEL_12_0, &_IID_ID3D12Device, true) + d, err := _D3D12CreateDevice(unsafe.Pointer(adapter), featureLevel, &_IID_ID3D12Device, true) if err != nil { return err }