mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-02-08 01:54:15 +01:00
[d3d11] Fix error return on MAP_WRITE_NO_OVERWRITE on deferred context
Fixes a wine test.
This commit is contained in:
parent
67c5ab87f9
commit
f0e9138886
@ -216,7 +216,7 @@ namespace dxvk {
|
|||||||
: MapImage (pResource, Subresource, &mapInfo);
|
: MapImage (pResource, Subresource, &mapInfo);
|
||||||
|
|
||||||
if (unlikely(FAILED(status))) {
|
if (unlikely(FAILED(status))) {
|
||||||
*pMappedResource = D3D11_MAPPED_SUBRESOURCE();
|
pMappedResource->pData = nullptr;
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -229,8 +229,8 @@ namespace dxvk {
|
|||||||
auto entry = FindMapEntry(pResource, Subresource);
|
auto entry = FindMapEntry(pResource, Subresource);
|
||||||
|
|
||||||
if (unlikely(!entry)) {
|
if (unlikely(!entry)) {
|
||||||
*pMappedResource = D3D11_MAPPED_SUBRESOURCE();
|
pMappedResource->pData = nullptr;
|
||||||
return E_INVALIDARG;
|
return D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return same memory region as earlier
|
// Return same memory region as earlier
|
||||||
@ -238,7 +238,7 @@ namespace dxvk {
|
|||||||
return S_OK;
|
return S_OK;
|
||||||
} else {
|
} else {
|
||||||
// Not allowed on deferred contexts
|
// Not allowed on deferred contexts
|
||||||
*pMappedResource = D3D11_MAPPED_SUBRESOURCE();
|
pMappedResource->pData = nullptr;
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user