Buffer locking cleanup #3454
Merged
Buffer locking cleanup #3454
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I decided to keep the "allowDirectBufferMapping" option after all and enable it for Injustice. |
|
Does this also fix #2375 mayhaps? |
|
@WinterSnowfall It doesn't, see my comment in the issue. |
K0bin
force-pushed
the
buffer-lock-stuff
branch
2 times, most recently
from
9ff34c2
to
ff17f53
Compare
I cannot reproduce the stalls anymore.
The game uses SWVP, so we don't need the hack anymore.
Tests show that buffers with just D3DUSAGE_WRITEONLY are uploaded on Unlock.
| @@ -4808,6 +4808,10 @@ namespace dxvk { | |||
| if (desc.Usage & D3DUSAGE_DYNAMIC) | |||
| Flags &= ~D3DLOCK_DONOTWAIT; | |||
|
|
|||
| // Tests show that D3D9 drivers ignore DISCARD when the device is lost. | |||
| if (unlikely(m_deviceLostState != D3D9DeviceLostState::Ok)) | |||
There was a problem hiding this comment.
What about for images?
The game uses SWVP, so we don't need an app hack here.
It's not just used for apitrace and the new name is more consistent with the D3D11 equivalent option.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Feels good to remove hacks.
Thanks to Axel Davy of Gallium Nine fame for telling me about the SWVP edge case here.
8bf11fd helps Injustice: Gods Among Us.