rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-12 13:54:14 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Fix software cursor reset and transitions

Browse Source
This commit is contained in:
WinterSnowfall 2024-10-08 20:55:52 +03:00 committed by Philip Rebohle
parent a30fdc466b
commit a1a3800b3f
3 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/d3d9/d3d9_cursor.cpp
View File

@ -9,15 +9,22 @@ namespace dxvk {
void D3D9Cursor::ResetCursor() { void D3D9Cursor::ResetCursor() {
ShowCursor(FALSE); ShowCursor(FALSE);
if (likely(m_hCursor != nullptr)) { if (m_hCursor != nullptr)
ResetHardwareCursor();
else
ResetSoftwareCursor();
}
void D3D9Cursor::ResetHardwareCursor() {
::DestroyCursor(m_hCursor); ::DestroyCursor(m_hCursor);
m_hCursor = nullptr; m_hCursor = nullptr;
} else {
m_sCursor.Width = 0;
m_sCursor.Height = 0;
m_sCursor.X = 0;
m_sCursor.Y = 0;
} }
void D3D9Cursor::ResetSoftwareCursor() {
m_sCursor.DrawCursor = false;
m_sCursor.ResetCursor = true;
} }
@ -44,20 +51,18 @@ namespace dxvk {
if (unlikely(m_hCursor == nullptr && m_sCursor.Width == 0 && m_sCursor.Height == 0)) if (unlikely(m_hCursor == nullptr && m_sCursor.Width == 0 && m_sCursor.Height == 0))
return m_visible; return m_visible;
if (likely(m_hCursor != nullptr)) if (m_hCursor != nullptr)
::SetCursor(bShow ? m_hCursor : nullptr); ::SetCursor(bShow ? m_hCursor : nullptr);
else
m_sCursor.DrawCursor = bShow;
return std::exchange(m_visible, bShow); return std::exchange(m_visible, bShow);
} }
HRESULT D3D9Cursor::SetHardwareCursor(UINT XHotSpot, UINT YHotSpot, const CursorBitmap& bitmap) { HRESULT D3D9Cursor::SetHardwareCursor(UINT XHotSpot, UINT YHotSpot, const CursorBitmap& bitmap) {
if (unlikely(IsSoftwareCursor())) { if (IsSoftwareCursor())
m_sCursor.Width = 0; ResetSoftwareCursor();
m_sCursor.Height = 0;
m_sCursor.X = 0;
m_sCursor.Y = 0;
}
CursorMask mask; CursorMask mask;
std::memset(mask, ~0, sizeof(mask)); std::memset(mask, ~0, sizeof(mask));
@ -87,10 +92,8 @@ namespace dxvk {
// Make sure to hide the win32 cursor // Make sure to hide the win32 cursor
::SetCursor(nullptr); ::SetCursor(nullptr);
if (unlikely(m_hCursor != nullptr)) { if (m_hCursor != nullptr)
::DestroyCursor(m_hCursor); ResetHardwareCursor();
m_hCursor = nullptr;
}
m_sCursor.Width = Width; m_sCursor.Width = Width;
m_sCursor.Height = Height; m_sCursor.Height = Height;
@ -107,6 +110,13 @@ namespace dxvk {
Logger::warn("D3D9Cursor::ResetCursor: Not supported on current platform."); Logger::warn("D3D9Cursor::ResetCursor: Not supported on current platform.");
} }
void D3D9Cursor::ResetHardwareCursor() {
Logger::warn("D3D9Cursor::ResetHardwareCursor: Not supported on current platform.");
}
void D3D9Cursor::ResetSoftwareCursor() {
Logger::warn("D3D9Cursor::ResetSoftwareCursor: Not supported on current platform.");
}
void D3D9Cursor::UpdateCursor(int X, int Y) { void D3D9Cursor::UpdateCursor(int X, int Y) {
Logger::warn("D3D9Cursor::UpdateCursor: Not supported on current platform."); Logger::warn("D3D9Cursor::UpdateCursor: Not supported on current platform.");

6
src/d3d9/d3d9_cursor.h
View File

@ -12,6 +12,8 @@ namespace dxvk {
UINT Height = 0; UINT Height = 0;
UINT X = 0; UINT X = 0;
UINT Y = 0; UINT Y = 0;
bool DrawCursor = false;
bool ResetCursor = false;
}; };
constexpr uint32_t HardwareCursorWidth = 32u; constexpr uint32_t HardwareCursorWidth = 32u;
@ -37,6 +39,10 @@ namespace dxvk {
void ResetCursor(); void ResetCursor();
void ResetHardwareCursor();
void ResetSoftwareCursor();
void UpdateCursor(int X, int Y); void UpdateCursor(int X, int Y);
void RefreshSoftwareCursorPosition(); void RefreshSoftwareCursorPosition();

15
src/d3d9/d3d9_device.cpp
View File

@ -3917,11 +3917,22 @@ namespace dxvk {
D3D9_SOFTWARE_CURSOR* pSoftwareCursor = m_cursor.GetSoftwareCursor(); D3D9_SOFTWARE_CURSOR* pSoftwareCursor = m_cursor.GetSoftwareCursor();
UINT cursorWidth = m_cursor.IsCursorVisible() ? pSoftwareCursor->Width : 0; UINT cursorWidth = pSoftwareCursor->DrawCursor ? pSoftwareCursor->Width : 0;
UINT cursorHeight = m_cursor.IsCursorVisible() ? pSoftwareCursor->Height : 0; UINT cursorHeight = pSoftwareCursor->DrawCursor ? pSoftwareCursor->Height : 0;
m_implicitSwapchain->SetCursorPosition(pSoftwareCursor->X, pSoftwareCursor->Y, m_implicitSwapchain->SetCursorPosition(pSoftwareCursor->X, pSoftwareCursor->Y,
cursorWidth, cursorHeight); cursorWidth, cursorHeight);
// Once a hardware cursor has been set or the device has been reset,
// we need to ensure that we render a 0-sized rectangle first, and
// only then fully clear the software cursor.
if (unlikely(pSoftwareCursor->ResetCursor)) {
pSoftwareCursor->Width = 0;
pSoftwareCursor->Height = 0;
pSoftwareCursor->X = 0;
pSoftwareCursor->Y = 0;
pSoftwareCursor->ResetCursor = false;
}
} }
return m_implicitSwapchain->Present( return m_implicitSwapchain->Present(