lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

D3D11: Improve handling of unsupported tiled resources feature

Browse Source 
Return DXGI_ERROR_UNSUPPORTED if try to create tiled resources
from CreateBuffer(), CreateTexture2D(), CreateTexture2D1()

Return D3D11_TILED_RESOURCES_NOT_SUPPORTED in CheckFeatures() with D3D11_FEATURE_D3D11_OPTIONS1
This commit is contained in:
Jake Turner
2024-01-08 12:40:21 +00:00
parent b820a46605
commit 6862b620f5
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d11/d3d11_device3_wrap.cpp
+4
View File
@@ -125,6 +125,10 @@ HRESULT WrappedID3D11Device::CreateTexture2D1(const D3D11_TEXTURE2D_DESC1 *pDesc
if(m_pDevice3 == NULL)
return E_NOINTERFACE;
// Tiled resources are not supported
if(pDesc1 && pDesc1->MiscFlags & D3D11_RESOURCE_MISC_TILED)
return DXGI_ERROR_UNSUPPORTED;
// validation, returns S_FALSE for valid params, or an error code
if(ppTexture2D == NULL)
return m_pDevice3->CreateTexture2D1(pDesc1, pInitialData, NULL);
renderdoc/driver/d3d11/d3d11_device_wrap.cpp
+32 -8
View File
@@ -172,6 +172,11 @@ HRESULT WrappedID3D11Device::CreateBuffer(const D3D11_BUFFER_DESC *pDesc,
const D3D11_SUBRESOURCE_DATA *pInitialData,
ID3D11Buffer **ppBuffer)
{
// Tiled resources are not supported
if(pDesc && ((pDesc->MiscFlags & D3D11_RESOURCE_MISC_TILED) ||
(pDesc->MiscFlags & D3D11_RESOURCE_MISC_TILE_POOL)))
return DXGI_ERROR_UNSUPPORTED;
// validation, returns S_FALSE for valid params, or an error code
if(ppBuffer == NULL)
return m_pDevice->CreateBuffer(pDesc, pInitialData, NULL);
@@ -599,6 +604,10 @@ HRESULT WrappedID3D11Device::CreateTexture2D(const D3D11_TEXTURE2D_DESC *pDesc,
const D3D11_SUBRESOURCE_DATA *pInitialData,
ID3D11Texture2D **ppTexture2D)
{
// Tiled resources are not supported
if(pDesc && pDesc->MiscFlags & D3D11_RESOURCE_MISC_TILED)
return DXGI_ERROR_UNSUPPORTED;
// validation, returns S_FALSE for valid params, or an error code
if(ppTexture2D == NULL)
return m_pDevice->CreateTexture2D(pDesc, pInitialData, NULL);
@@ -3997,21 +4006,36 @@ HRESULT WrappedID3D11Device::CheckCounter(const D3D11_COUNTER_DESC *pDesc, D3D11
HRESULT WrappedID3D11Device::CheckFeatureSupport(D3D11_FEATURE Feature, void *pFeatureSupportData,
UINT FeatureSupportDataSize)
{
if(Feature == D3D11_FEATURE_D3D11_OPTIONS2)
if((Feature == D3D11_FEATURE_D3D11_OPTIONS1) || (Feature == D3D11_FEATURE_D3D11_OPTIONS2))
{
HRESULT hr = m_pDevice->CheckFeatureSupport(Feature, pFeatureSupportData, FeatureSupportDataSize);
if(SUCCEEDED(hr))
{
D3D11_FEATURE_DATA_D3D11_OPTIONS2 *opts =
(D3D11_FEATURE_DATA_D3D11_OPTIONS2 *)pFeatureSupportData;
if(FeatureSupportDataSize != sizeof(D3D11_FEATURE_DATA_D3D11_OPTIONS2))
return E_INVALIDARG;
if(Feature == D3D11_FEATURE_D3D11_OPTIONS1)
{
D3D11_FEATURE_DATA_D3D11_OPTIONS1 *opts =
(D3D11_FEATURE_DATA_D3D11_OPTIONS1 *)pFeatureSupportData;
if(FeatureSupportDataSize != sizeof(D3D11_FEATURE_DATA_D3D11_OPTIONS1))
return E_INVALIDARG;
// don't support tiled resources
opts->TiledResourcesTier = D3D11_TILED_RESOURCES_NOT_SUPPORTED;
// don't support tiled resources
opts->TiledResourcesTier = D3D11_TILED_RESOURCES_NOT_SUPPORTED;
return S_OK;
return S_OK;
}
else
{
D3D11_FEATURE_DATA_D3D11_OPTIONS2 *opts =
(D3D11_FEATURE_DATA_D3D11_OPTIONS2 *)pFeatureSupportData;
if(FeatureSupportDataSize != sizeof(D3D11_FEATURE_DATA_D3D11_OPTIONS2))
return E_INVALIDARG;
// don't support tiled resources
opts->TiledResourcesTier = D3D11_TILED_RESOURCES_NOT_SUPPORTED;
return S_OK;
}
}
return hr;