From 59dd2d54cd4e701997f295e49f343a59500de6b4 Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sat, 3 Sep 2022 23:27:40 +0200
Subject: [PATCH] [d3d11] Add convenience query for Tiled Resources tier
---
src/d3d11/d3d11_device.cpp | 21 +++++++++++++--------
src/d3d11/d3d11_device.h | 1 -
src/d3d11/d3d11_features.h | 8 ++++++++
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
index ea6c0f3bd..d2ed9b5ec 100644
--- a/src/d3d11/d3d11_device.cpp
+++ b/src/d3d11/d3d11_device.cpp
@@ -47,8 +47,7 @@ namespace dxvk {
m_d3d11Options (m_dxvkDevice->instance()->config(), m_dxvkDevice),
m_dxbcOptions (m_dxvkDevice, m_d3d11Options),
m_maxFeatureLevel (GetMaxFeatureLevel(m_dxvkDevice->instance(), m_dxvkDevice->adapter())),
- m_deviceFeatures (m_dxvkDevice->instance(), m_dxvkDevice->adapter(), m_featureLevel),
- m_tiledResourcesTier(DetermineTiledResourcesTier(m_dxvkDevice->features(), m_dxvkDevice->properties())) {
+ m_deviceFeatures (m_dxvkDevice->instance(), m_dxvkDevice->adapter(), m_featureLevel) {
m_initializer = new D3D11Initializer(this);
m_context = new D3D11ImmediateContext(this, m_dxvkDevice);
m_d3d10Device = new D3D10Device(this, m_context.ptr());
@@ -87,7 +86,8 @@ namespace dxvk {
return E_INVALIDARG;
D3D11_BUFFER_DESC desc = *pDesc;
- HRESULT hr = D3D11Buffer::NormalizeBufferProperties(&desc, m_tiledResourcesTier);
+ HRESULT hr = D3D11Buffer::NormalizeBufferProperties(&desc,
+ m_deviceFeatures.GetTiledResourcesTier());
if (FAILED(hr))
return hr;
@@ -210,7 +210,8 @@ namespace dxvk {
desc.MiscFlags = pDesc->MiscFlags;
desc.TextureLayout = pDesc->TextureLayout;
- HRESULT hr = D3D11CommonTexture::NormalizeTextureProperties(&desc, m_tiledResourcesTier);
+ HRESULT hr = D3D11CommonTexture::NormalizeTextureProperties(&desc,
+ m_deviceFeatures.GetTiledResourcesTier());
if (FAILED(hr))
return hr;
@@ -285,13 +286,14 @@ namespace dxvk {
desc.MiscFlags = pDesc->MiscFlags;
desc.TextureLayout = pDesc->TextureLayout;
- HRESULT hr = D3D11CommonTexture::NormalizeTextureProperties(&desc, m_tiledResourcesTier);
+ D3D11_TILED_RESOURCES_TIER tiledResourcesTier = m_deviceFeatures.GetTiledResourcesTier();
+ HRESULT hr = D3D11CommonTexture::NormalizeTextureProperties(&desc, tiledResourcesTier);
if (FAILED(hr))
return hr;
if ((desc.MiscFlags & D3D11_RESOURCE_MISC_TILED)
- && (m_tiledResourcesTier < D3D11_TILED_RESOURCES_TIER_3))
+ && (tiledResourcesTier < D3D11_TILED_RESOURCES_TIER_3))
return E_INVALIDARG;
if (!ppTexture3D)
@@ -1160,7 +1162,9 @@ namespace dxvk {
if (FAILED(D3D11SamplerState::NormalizeDesc(&desc)))
return E_INVALIDARG;
- if (IsMinMaxFilter(desc.Filter) && m_tiledResourcesTier < D3D11_TILED_RESOURCES_TIER_2)
+ D3D11_TILED_RESOURCES_TIER tiledResourcesTier = m_deviceFeatures.GetTiledResourcesTier();
+
+ if (IsMinMaxFilter(desc.Filter) && tiledResourcesTier < D3D11_TILED_RESOURCES_TIER_2)
return E_INVALIDARG;
if (!ppSamplerState)
@@ -2035,9 +2039,10 @@ namespace dxvk {
if (GetImageTypeSupport(fmtMapping.Format, VK_IMAGE_TYPE_3D, 0)) flags1 |= D3D11_FORMAT_SUPPORT_TEXTURE3D;
// We only support tiled resources with a single aspect
+ D3D11_TILED_RESOURCES_TIER tiledResourcesTier = m_deviceFeatures.GetTiledResourcesTier();
VkImageAspectFlags sparseAspects = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT;
- if (m_tiledResourcesTier && !(fmtProperties->aspectMask & ~sparseAspects)) {
+ if (tiledResourcesTier && !(fmtProperties->aspectMask & ~sparseAspects)) {
VkImageCreateFlags flags = VK_IMAGE_CREATE_SPARSE_BINDING_BIT
| VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT
| VK_IMAGE_CREATE_SPARSE_ALIASED_BIT;
diff --git a/src/d3d11/d3d11_device.h b/src/d3d11/d3d11_device.h
index 48221c2a0..cfa2369c3 100644
--- a/src/d3d11/d3d11_device.h
+++ b/src/d3d11/d3d11_device.h
@@ -456,7 +456,6 @@ namespace dxvk {
D3D_FEATURE_LEVEL m_maxFeatureLevel;
D3D11DeviceFeatures m_deviceFeatures;
- D3D11_TILED_RESOURCES_TIER m_tiledResourcesTier;
HRESULT CreateShaderModule(
D3D11CommonShader* pShaderModule,
diff --git a/src/d3d11/d3d11_features.h b/src/d3d11/d3d11_features.h
index 51dab32bd..b17dd824e 100644
--- a/src/d3d11/d3d11_features.h
+++ b/src/d3d11/d3d11_features.h
@@ -38,6 +38,14 @@ namespace dxvk {
UINT FeatureDataSize,
void* pFeatureData) const;
+ /**
+ * \brief Queries tiled resources tier
+ * \returns Tiled resources tier
+ */
+ D3D11_TILED_RESOURCES_TIER GetTiledResourcesTier() const {
+ return m_d3d11Options2.TiledResourcesTier;
+ }
+
private:
DxvkDeviceFeatures m_features;