rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-11-29 19:24:10 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Set proper view format list for typed UAVs

Browse Source 
Typed UAVs are mutable, but we only need them to be compatible to
their typed format and the bit-compatible integer format used for
clears.
This commit is contained in:
Philip Rebohle 2018-07-03 13:31:22 +02:00
parent cbf4772973
commit 63af141383
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/d3d11/d3d11_texture.cpp
View File

@ -29,29 +29,40 @@ namespace dxvk {
| VK_ACCESS_TRANSFER_WRITE_BIT; | VK_ACCESS_TRANSFER_WRITE_BIT;
imageInfo.tiling = VK_IMAGE_TILING_OPTIMAL; imageInfo.tiling = VK_IMAGE_TILING_OPTIMAL;
imageInfo.layout = VK_IMAGE_LAYOUT_GENERAL; imageInfo.layout = VK_IMAGE_LAYOUT_GENERAL;
imageInfo.viewFormatCount = formatFamily.FormatCount;
imageInfo.viewFormats = formatFamily.Formats;
DecodeSampleCount(m_desc.SampleDesc.Count, &imageInfo.sampleCount); DecodeSampleCount(m_desc.SampleDesc.Count, &imageInfo.sampleCount);
// The image must be marked as mutable if it can be // Integer clear operations on UAVs are implemented using
// reinterpreted by a view with a different format // a view with a bit-compatible integer format, so we'll
bool mutableFormat = formatFamily.FormatCount > 1; // have to include that format in the format family
// For UAVs, the format restrictions are more relaxed.
// FIXME for typed formats, we should just add the
// corresponding integer format to the format family
if (m_desc.BindFlags & D3D11_BIND_UNORDERED_ACCESS) { if (m_desc.BindFlags & D3D11_BIND_UNORDERED_ACCESS) {
imageInfo.viewFormatCount = 0; DXGI_VK_FORMAT_INFO formatBase = m_device->LookupFormat(
imageInfo.viewFormats = nullptr; m_desc.Format, DXGI_VK_FORMAT_MODE_RAW);
mutableFormat = true;
if (formatBase.Format != formatInfo.Format
&& formatBase.Format != VK_FORMAT_UNDEFINED) {
formatFamily.Add(formatBase.Format);
formatFamily.Add(formatInfo.Format);
}
} }
// Depth-stencil formats are not compatible to each other. // The image must be marked as mutable if it can be reinterpreted
// by a view with a different format. Depth-stencil formats cannot
// be reinterpreted in Vulkan, so we'll ignore those.
VkImageAspectFlags formatAspect = imageFormatInfo(formatInfo.Format)->aspectMask; VkImageAspectFlags formatAspect = imageFormatInfo(formatInfo.Format)->aspectMask;
if (mutableFormat && (formatAspect & VK_IMAGE_ASPECT_COLOR_BIT)) bool isTypeless = formatInfo.Aspect == 0;
bool isMutable = formatFamily.FormatCount > 1;
if (isMutable && (formatAspect & VK_IMAGE_ASPECT_COLOR_BIT)) {
imageInfo.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; imageInfo.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT;
// Typeless UAV images have relaxed reinterpretation rules
if (!isTypeless || !(m_desc.BindFlags & D3D11_BIND_UNORDERED_ACCESS)) {
imageInfo.viewFormatCount = formatFamily.FormatCount;
imageInfo.viewFormats = formatFamily.Formats;
}
}
// Adjust image flags based on the corresponding D3D flags // Adjust image flags based on the corresponding D3D flags
if (m_desc.BindFlags & D3D11_BIND_SHADER_RESOURCE) { if (m_desc.BindFlags & D3D11_BIND_SHADER_RESOURCE) {

17
src/dxgi/dxgi_format.h
View File

@ -66,10 +66,21 @@ namespace dxvk {
constexpr static size_t MaxSize = 8; constexpr static size_t MaxSize = 8;
DXGI_VK_FORMAT_FAMILY() { } DXGI_VK_FORMAT_FAMILY() { }
DXGI_VK_FORMAT_FAMILY( DXGI_VK_FORMAT_FAMILY(const std::initializer_list<VkFormat>& FormatList) {
const std::initializer_list<VkFormat>& FormatList) {
for (VkFormat f : FormatList) for (VkFormat f : FormatList)
Formats[FormatCount++] = f; Add(f);
}
BOOL Add(VkFormat Format) {
for (UINT i = 0; i < FormatCount; i++) {
if (Formats[i] == Format)
return TRUE;
}
if (FormatCount < MaxSize) {
Formats[FormatCount++] = Format;
return TRUE;
} return FALSE;
} }
UINT FormatCount = 0; UINT FormatCount = 0;