rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-04 10:29:15 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Adjust out of bounds clip plane index handling

Browse Source
This commit is contained in:
WinterSnowfall 2024-11-26 23:41:06 +02:00 committed by Robin Kertels
parent 9c012c8e75
commit fb56668dc0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/d3d9/d3d9_device.cpp
View File

@ -2187,9 +2187,13 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D9DeviceEx::SetClipPlane(DWORD Index, const float* pPlane) { HRESULT STDMETHODCALLTYPE D3D9DeviceEx::SetClipPlane(DWORD Index, const float* pPlane) {
D3D9DeviceLock lock = LockDevice(); D3D9DeviceLock lock = LockDevice();
if (unlikely(Index >= caps::MaxClipPlanes || !pPlane)) if (unlikely(!pPlane))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
// Higher indexes will be capped to the last valid index
if (unlikely(Index >= caps::MaxClipPlanes))
Index = caps::MaxClipPlanes - 1;
if (unlikely(ShouldRecord())) if (unlikely(ShouldRecord()))
return m_recorder->SetClipPlane(Index, pPlane); return m_recorder->SetClipPlane(Index, pPlane);
@ -2213,9 +2217,13 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D9DeviceEx::GetClipPlane(DWORD Index, float* pPlane) { HRESULT STDMETHODCALLTYPE D3D9DeviceEx::GetClipPlane(DWORD Index, float* pPlane) {
D3D9DeviceLock lock = LockDevice(); D3D9DeviceLock lock = LockDevice();
if (unlikely(Index >= caps::MaxClipPlanes || !pPlane)) if (unlikely(!pPlane))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
// Higher indexes will be capped to the last valid index
if (unlikely(Index >= caps::MaxClipPlanes))
Index = caps::MaxClipPlanes - 1;
for (uint32_t i = 0; i < 4; i++) for (uint32_t i = 0; i < 4; i++)
pPlane[i] = m_state.clipPlanes[Index].coeff[i]; pPlane[i] = m_state.clipPlanes[Index].coeff[i];