mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/directx: bug fix: go:nosplit was required for syscallN

Browse Source 
Updates #2116
Closes #2117
This commit is contained in:
Hajime Hoshi 2022-06-04 01:10:52 +09:00
parent 55a490736a
commit f69c550992
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/graphicsdriver/directx/api_windows.go
View File

@ -38,6 +38,7 @@ func boolToUintptr(v bool) uintptr {
return 0 return 0
} }
//go:nosplit
func syscallN(ptr uintptr, args ...uintptr) (r1, r2 uintptr, e windows.Errno) { func syscallN(ptr uintptr, args ...uintptr) (r1, r2 uintptr, e windows.Errno) {
if ptr == 0 { if ptr == 0 {
panic("directx: function pointer must not be 0") panic("directx: function pointer must not be 0")
@ -1790,8 +1791,6 @@ func (i *_ID3D12Resource) GetGPUVirtualAddress() _D3D12_GPU_VIRTUAL_ADDRESS {
} }
func (i *_ID3D12Resource) Map(subresource uint32, pReadRange *_D3D12_RANGE) (uintptr, error) { func (i *_ID3D12Resource) Map(subresource uint32, pReadRange *_D3D12_RANGE) (uintptr, error) {
var retryCount int
retry:
var data uintptr var data uintptr
r, _, _ := syscallN(i.vtbl.Map, uintptr(unsafe.Pointer(i)), r, _, _ := syscallN(i.vtbl.Map, uintptr(unsafe.Pointer(i)),
uintptr(subresource), uintptr(unsafe.Pointer(pReadRange)), uintptr(unsafe.Pointer(&data))) uintptr(subresource), uintptr(unsafe.Pointer(pReadRange)), uintptr(unsafe.Pointer(&data)))
@ -1799,14 +1798,6 @@ retry:
if uint32(r) != uint32(windows.S_OK) { if uint32(r) != uint32(windows.S_OK) {
return 0, fmt.Errorf("directx: ID3D12Resource::Map failed: HRESULT(%d)", uint32(r)) return 0, fmt.Errorf("directx: ID3D12Resource::Map failed: HRESULT(%d)", uint32(r))
} }
if data == 0 {
// This is very mysterious, but sometimes Map fails especially on tests with Warp and/or Proton (Steam Deck) (#2113).
if retryCount >= 5 {
return 0, fmt.Errorf("directx: ID3D12Resource::Map failed: nothing is mapped")
}
retryCount++
goto retry
}
return data, nil return data, nil
} }