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

[d3d11] Validate image view format compatibility

Browse Source 
Fixes Vulkan validation errors in Far Cry 5.
This commit is contained in:
Philip Rebohle 2018-05-05 15:13:35 +02:00
parent e1a27faa4a
commit 8177898151
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/d3d11/d3d11_device.cpp
View File

@ -360,7 +360,15 @@ namespace dxvk {
const D3D11CommonTexture* textureInfo = GetCommonTexture(pResource);
if ((textureInfo->Desc()->BindFlags & D3D11_BIND_SHADER_RESOURCE) == 0) {
Logger::warn("D3D11: Trying to create SRV for texture without D3D11_BIND_SHADER_RESOURCE");
Logger::err("D3D11: Trying to create SRV for texture without D3D11_BIND_SHADER_RESOURCE");
return E_INVALIDARG;
}
// Check whether we can use the requested format for the view
if (!textureInfo->CheckViewFormatCompatibility(desc.Format)) {
Logger::err(str::format("D3D11: Incompatible SRV formats",
"\n Base format: ", textureInfo->Desc()->Format,
"\n View format: ", desc.Format));
return E_INVALIDARG;
}
@ -567,6 +575,14 @@ namespace dxvk {
return E_INVALIDARG;
}
// Check whether we can use the requested format for the view
if (!textureInfo->CheckViewFormatCompatibility(desc.Format)) {
Logger::err(str::format("D3D11: Incompatible UAV formats",
"\n Base format: ", textureInfo->Desc()->Format,
"\n View format: ", desc.Format));
return E_INVALIDARG;
}
// Fill in the view info. The view type depends solely
// on the view dimension field in the view description,
// not on the resource type.
@ -687,6 +703,14 @@ namespace dxvk {
return E_INVALIDARG;
}
// Check whether we can use the requested format for the view
if (!textureInfo->CheckViewFormatCompatibility(desc.Format)) {
Logger::err(str::format("D3D11: Incompatible RTV formats",
"\n Base format: ", textureInfo->Desc()->Format,
"\n View format: ", desc.Format));
return E_INVALIDARG;
}
// Fill in Vulkan image view info
DxvkImageViewCreateInfo viewInfo;
viewInfo.format = m_dxgiAdapter->LookupFormat(desc.Format, DXGI_VK_FORMAT_MODE_COLOR).Format;
@ -805,6 +829,14 @@ namespace dxvk {
return E_INVALIDARG;
}
// Check whether we can use the requested format for the view
if (!textureInfo->CheckViewFormatCompatibility(desc.Format)) {
Logger::err(str::format("D3D11: Incompatible DSV formats",
"\n Base format: ", textureInfo->Desc()->Format,
"\n View format: ", desc.Format));
return E_INVALIDARG;
}
// Fill in Vulkan image view info
DxvkImageViewCreateInfo viewInfo;
viewInfo.format = m_dxgiAdapter->LookupFormat(desc.Format, DXGI_VK_FORMAT_MODE_DEPTH).Format;

19
src/d3d11/d3d11_texture.cpp
View File

@ -166,6 +166,25 @@ namespace dxvk {
}
bool D3D11CommonTexture::CheckViewFormatCompatibility(DXGI_FORMAT Format) const {
DXGI_VK_FORMAT_MAPPING baseFormat = m_device->GetFormatMapping(m_desc.Format);
DXGI_VK_FORMAT_MAPPING viewFormat = m_device->GetFormatMapping(Format);
// The view format cannot be typeless
if (Format == viewFormat.FormatFamily)
return false;
// If the resource is strongly typed, the view
// format must be identical to the base format.
if (m_desc.Format != baseFormat.FormatFamily)
return Format == m_desc.Format;
// If the resource is typeless, the view format
// must be part of the same format family.
return viewFormat.FormatFamily == baseFormat.FormatFamily;
}
HRESULT D3D11CommonTexture::NormalizeTextureProperties(D3D11_COMMON_TEXTURE_DESC* pDesc) {
if (FAILED(DecodeSampleCount(pDesc->SampleDesc.Count, nullptr)))
return E_INVALIDARG;

11
src/d3d11/d3d11_texture.h
View File

@ -148,6 +148,17 @@ namespace dxvk {
*/
void GetDevice(ID3D11Device** ppDevice) const;
/**
* \brief Checks whether a format can be used to view this textue
*
* View formats are only compatible if they are either identical
* or from the same family of typeless formats, where the resource
* format must be typeless and the view format must be typed.
* \param [in] Format The desired view format
* \returns \c true if the format is compatible
*/
bool CheckViewFormatCompatibility(DXGI_FORMAT Format) const;
/**
* \brief Normalizes and validates texture description
*