rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-15 07:29:17 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[d3d11] Re-enable image mapping"

Browse Source 
Still breaks games for unknown reasons.
This commit is contained in:
Philip Rebohle 2018-03-13 17:40:12 +01:00
parent ba2c4782b0
commit e6814332e7
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/d3d11/d3d11_texture.cpp
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
| VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
| VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
} else {
// If only write access is required, we will emulate
// image mapping through a buffer. Some games ignore
// the row pitch when mapping images, which leads to
// incorrect rendering.
return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
} // if (CPUAccessFlags & D3D11_CPU_ACCESS_READ) {
// return VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT
// | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT
// | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
// } else {
// // If only write access is required, we will emulate
// // image mapping through a buffer. Some games ignore
// // the row pitch when mapping images, which leads to
// // incorrect rendering.
// return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
// }
} }