[d3d8] GetInfo rework & a couple of CopyRects validation tweaks #4296
+21
−30
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.
I've reworked our implementation of GetInfo() to more closely follow what d9vk is doing, namely:
pQuery->Issue()
will never fail in d9vk (and even if can fail according to spec, we shouldn't care much, aspQuery->GetData()
would also then fail).D3DDEVINFOID_RESOURCEMANAGER
andD3DDEVINFOID_VERTEXSTATS
, though technically supported by d3d8 are not implemented in d9vk. D3D9'sCreateQuery()
will always returnD3DERR_NOTAVAILABLE
for both as it stands, thus we shouldn't really speculate on the outcome (removed the "unlikely" hint).GetData()
should always be called withD3DGETDATA_FLUSH
for the queries that D3D8 supports.GetData()
returns are inline with whatGetInfo()
should return if it reaches that point.The above allows us to get rid of the goto and restructure the flow a bit.
Also as part of this PR I've changed some
CopyRects
behavior:copyTextureBuffers
, since this is now done globally onCopyRects
calls, as per spec.CopyRects
depth stencil checks are done after the format difference checks, so there's no need to check both src and dest.