Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small RSGetViewports fix #1117

Closed
wants to merge 2 commits into from
Closed

Small RSGetViewports fix #1117

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0610456
[d3d11] Only set pNumViewports if pViewports is null
K0bin Jul 8, 2019
688cb81
[d3d11] Only set pNumRects if pRects is null
K0bin Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/d3d11/d3d11_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2858,9 +2858,8 @@ namespace dxvk {
pViewports[i].MaxDepth = 0.0f;
}
}
}

*pNumViewports = m_state.rs.numViewports;
} else
*pNumViewports = m_state.rs.numViewports;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

else if (pNumViewports != nullptr) perhaps? Not in our best interests to crash from user data.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows D3D11 also just crashes when you pass null for that.

}


Expand All @@ -2880,9 +2879,8 @@ namespace dxvk {
pRects[i].bottom = 0;
}
}
}

*pNumRects = m_state.rs.numScissors;
} else
*pNumRects = m_state.rs.numScissors;
}


Expand Down