1
0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00

[d3d11] Disabled image mapping

Effectively reverts d3e89b20dda226dc142aae1b83cc9c90e09f1a5e as it
breaks games for some reason.
This commit is contained in:
Philip Rebohle 2018-03-11 19:02:02 +01:00
parent 5b9e4c1faa
commit bbbc552868
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99

View File

@ -148,7 +148,7 @@ namespace dxvk {
if (CPUAccessFlags & D3D11_CPU_ACCESS_READ) { if (CPUAccessFlags & D3D11_CPU_ACCESS_READ) {
pImageInfo->access |= VK_ACCESS_HOST_READ_BIT; pImageInfo->access |= VK_ACCESS_HOST_READ_BIT;
pImageInfo->tiling = VK_IMAGE_TILING_LINEAR; // pImageInfo->tiling = VK_IMAGE_TILING_LINEAR;
} }
} }
@ -169,17 +169,19 @@ namespace dxvk {
* \returns Image memory properties * \returns Image memory properties
*/ */
static VkMemoryPropertyFlags GetImageMemoryFlags(UINT CPUAccessFlags) { static VkMemoryPropertyFlags GetImageMemoryFlags(UINT CPUAccessFlags) {
if (CPUAccessFlags & D3D11_CPU_ACCESS_READ) { // FIXME investigate why image mapping breaks games
return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
| VK_MEMORY_PROPERTY_HOST_COHERENT_BIT // if (CPUAccessFlags & D3D11_CPU_ACCESS_READ) {
| VK_MEMORY_PROPERTY_HOST_CACHED_BIT; // return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT
} else { // | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
// If only write access is required, we will emulate // | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
// image mapping through a buffer. Some games ignore // } else {
// the row pitch when mapping images, which leads to // // If only write access is required, we will emulate
// incorrect rendering. // // image mapping through a buffer. Some games ignore
return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; // // the row pitch when mapping images, which leads to
} // // incorrect rendering.
// return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
// }
} }