From 0c072894b5f335d576d6d6657d2842b187a5a31c Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 25 Dec 2022 21:57:26 +0900 Subject: [PATCH] internal/microsoftgdk: improve forward compatibility --- internal/microsoftgdk/microsoftgdk_windows.go | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/internal/microsoftgdk/microsoftgdk_windows.go b/internal/microsoftgdk/microsoftgdk_windows.go index 163417585..f364f1107 100644 --- a/internal/microsoftgdk/microsoftgdk_windows.go +++ b/internal/microsoftgdk/microsoftgdk_windows.go @@ -63,6 +63,8 @@ func IsXbox() bool { func MonitorResolution() (int, int) { switch C.XSystemGetDeviceType() { + case _XSystemDeviceType_Unknown, _XSystemDeviceType_Pc: + return 1920, 1080 case _XSystemDeviceType_XboxOne, _XSystemDeviceType_XboxOneS: return 1920, 1080 case _XSystemDeviceType_XboxScarlettLockhart: @@ -70,31 +72,38 @@ func MonitorResolution() (int, int) { return 2560, 1440 case _XSystemDeviceType_XboxOneX, _XSystemDeviceType_XboxOneXDevkit, _XSystemDeviceType_XboxScarlettAnaconda, _XSystemDeviceType_XboxScarlettDevkit: // Series X - return 3840, 2160 + fallthrough default: - return 1920, 1080 + // Forward compatibility. + return 3840, 2160 } } func D3D12DLLName() string { switch C.XSystemGetDeviceType() { + case _XSystemDeviceType_Unknown, _XSystemDeviceType_Pc: + return "" case _XSystemDeviceType_XboxOne, _XSystemDeviceType_XboxOneS, _XSystemDeviceType_XboxOneX, _XSystemDeviceType_XboxOneXDevkit: return "d3d12_x.dll" case _XSystemDeviceType_XboxScarlettLockhart, _XSystemDeviceType_XboxScarlettAnaconda, _XSystemDeviceType_XboxScarlettDevkit: - return "d3d12_xs.dll" + fallthrough default: - return "" + // Forward compatibility. + return "d3d12_xs.dll" } } func D3D12SDKVersion() uint32 { switch C.XSystemGetDeviceType() { + case _XSystemDeviceType_Unknown, _XSystemDeviceType_Pc: + return 0 case _XSystemDeviceType_XboxOne, _XSystemDeviceType_XboxOneS, _XSystemDeviceType_XboxOneX, _XSystemDeviceType_XboxOneXDevkit: return (1 << 16) | 10 case _XSystemDeviceType_XboxScarlettLockhart, _XSystemDeviceType_XboxScarlettAnaconda, _XSystemDeviceType_XboxScarlettDevkit: - return (2 << 16) | 4 + fallthrough default: - return 0 + // Forward compatibility. + return (2 << 16) | 4 } }