backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d11] Allow creation of render target views for planar images

Browse Source
This commit is contained in:
Philip Rebohle 2021-05-28 17:28:30 +02:00
parent 01051bac99
commit 383cde2051
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/d3d11/d3d11_device.cpp
View File

@ -455,8 +455,10 @@ namespace dxvk {
ID3D11RenderTargetView** ppRTView) { ID3D11RenderTargetView** ppRTView) {
InitReturnPtr(ppRTView); InitReturnPtr(ppRTView);
uint32_t plane = GetViewPlaneIndex(pResource, pDesc ? pDesc->Format : DXGI_FORMAT_UNKNOWN);
D3D11_RENDER_TARGET_VIEW_DESC1 desc = pDesc D3D11_RENDER_TARGET_VIEW_DESC1 desc = pDesc
? D3D11RenderTargetView::PromoteDesc(pDesc) ? D3D11RenderTargetView::PromoteDesc(pDesc, plane)
: D3D11_RENDER_TARGET_VIEW_DESC1(); : D3D11_RENDER_TARGET_VIEW_DESC1();
ID3D11RenderTargetView1* view = nullptr; ID3D11RenderTargetView1* view = nullptr;
@ -505,12 +507,15 @@ namespace dxvk {
return E_INVALIDARG; return E_INVALIDARG;
} }
if (!CheckResourceViewCompatibility(pResource, D3D11_BIND_RENDER_TARGET, desc.Format, 0)) { uint32_t plane = D3D11RenderTargetView::GetPlaneSlice(&desc);
if (!CheckResourceViewCompatibility(pResource, D3D11_BIND_RENDER_TARGET, desc.Format, plane)) {
Logger::err(str::format("D3D11: Cannot create render target view:", Logger::err(str::format("D3D11: Cannot create render target view:",
"\n Resource type: ", resourceDesc.Dim, "\n Resource type: ", resourceDesc.Dim,
"\n Resource usage: ", resourceDesc.BindFlags, "\n Resource usage: ", resourceDesc.BindFlags,
"\n Resource format: ", resourceDesc.Format, "\n Resource format: ", resourceDesc.Format,
"\n View format: ", desc.Format)); "\n View format: ", desc.Format,
"\n View plane: ", plane));
return E_INVALIDARG; return E_INVALIDARG;
} }

32
src/d3d11/d3d11_view_rtv.cpp
View File

@ -14,6 +14,8 @@ namespace dxvk {
m_resource(pResource), m_desc(*pDesc), m_d3d10(this) { m_resource(pResource), m_desc(*pDesc), m_d3d10(this) {
ResourceAddRefPrivate(m_resource); ResourceAddRefPrivate(m_resource);
auto texture = GetCommonTexture(pResource);
D3D11_COMMON_RESOURCE_DESC resourceDesc; D3D11_COMMON_RESOURCE_DESC resourceDesc;
GetCommonResourceDesc(pResource, &resourceDesc); GetCommonResourceDesc(pResource, &resourceDesc);
@ -87,6 +89,9 @@ namespace dxvk {
throw DxvkError("D3D11: Invalid view dimension for RTV"); throw DxvkError("D3D11: Invalid view dimension for RTV");
} }
if (texture->GetPlaneCount() > 1)
viewInfo.aspect = vk::getPlaneAspect(GetPlaneSlice(pDesc));
// Normalize view type so that we won't accidentally // Normalize view type so that we won't accidentally
// bind 2D array views and 2D views at the same time // bind 2D array views and 2D views at the same time
if (viewInfo.numLayers == 1) { if (viewInfo.numLayers == 1) {
@ -105,8 +110,7 @@ namespace dxvk {
m_info.Image.NumLayers = viewInfo.numLayers; m_info.Image.NumLayers = viewInfo.numLayers;
// Create the underlying image view object // Create the underlying image view object
m_view = pDevice->GetDXVKDevice()->createImageView( m_view = pDevice->GetDXVKDevice()->createImageView(texture->GetImage(), viewInfo);
GetCommonTexture(pResource)->GetImage(), viewInfo);
} }
@ -272,7 +276,8 @@ namespace dxvk {
D3D11_RENDER_TARGET_VIEW_DESC1 D3D11RenderTargetView::PromoteDesc( D3D11_RENDER_TARGET_VIEW_DESC1 D3D11RenderTargetView::PromoteDesc(
const D3D11_RENDER_TARGET_VIEW_DESC* pDesc) { const D3D11_RENDER_TARGET_VIEW_DESC* pDesc,
UINT Plane) {
D3D11_RENDER_TARGET_VIEW_DESC1 dstDesc; D3D11_RENDER_TARGET_VIEW_DESC1 dstDesc;
dstDesc.Format = pDesc->Format; dstDesc.Format = pDesc->Format;
dstDesc.ViewDimension = pDesc->ViewDimension; dstDesc.ViewDimension = pDesc->ViewDimension;
@ -295,14 +300,14 @@ namespace dxvk {
case D3D11_RTV_DIMENSION_TEXTURE2D: case D3D11_RTV_DIMENSION_TEXTURE2D:
dstDesc.Texture2D.MipSlice = pDesc->Texture2D.MipSlice; dstDesc.Texture2D.MipSlice = pDesc->Texture2D.MipSlice;
dstDesc.Texture2D.PlaneSlice = 0; dstDesc.Texture2D.PlaneSlice = Plane;
break; break;
case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: case D3D11_RTV_DIMENSION_TEXTURE2DARRAY:
dstDesc.Texture2DArray.MipSlice = pDesc->Texture2DArray.MipSlice; dstDesc.Texture2DArray.MipSlice = pDesc->Texture2DArray.MipSlice;
dstDesc.Texture2DArray.FirstArraySlice = pDesc->Texture2DArray.FirstArraySlice; dstDesc.Texture2DArray.FirstArraySlice = pDesc->Texture2DArray.FirstArraySlice;
dstDesc.Texture2DArray.ArraySize = pDesc->Texture2DArray.ArraySize; dstDesc.Texture2DArray.ArraySize = pDesc->Texture2DArray.ArraySize;
dstDesc.Texture2DArray.PlaneSlice = 0; dstDesc.Texture2DArray.PlaneSlice = Plane;
break; break;
case D3D11_RTV_DIMENSION_TEXTURE2DMS: case D3D11_RTV_DIMENSION_TEXTURE2DMS:
@ -396,16 +401,11 @@ namespace dxvk {
break; break;
case D3D11_RTV_DIMENSION_TEXTURE2D: case D3D11_RTV_DIMENSION_TEXTURE2D:
if (pDesc->Texture2D.PlaneSlice != 0)
return E_INVALIDARG;
break; break;
case D3D11_RTV_DIMENSION_TEXTURE2DARRAY: case D3D11_RTV_DIMENSION_TEXTURE2DARRAY:
if (pDesc->Texture2DArray.ArraySize > numLayers - pDesc->Texture2DArray.FirstArraySlice) if (pDesc->Texture2DArray.ArraySize > numLayers - pDesc->Texture2DArray.FirstArraySlice)
pDesc->Texture2DArray.ArraySize = numLayers - pDesc->Texture2DArray.FirstArraySlice; pDesc->Texture2DArray.ArraySize = numLayers - pDesc->Texture2DArray.FirstArraySlice;
if (pDesc->Texture2DArray.PlaneSlice != 0)
return E_INVALIDARG;
break; break;
case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY: case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY:
@ -425,4 +425,16 @@ namespace dxvk {
return S_OK; return S_OK;
} }
UINT D3D11RenderTargetView::GetPlaneSlice(const D3D11_RENDER_TARGET_VIEW_DESC1* pDesc) {
switch (pDesc->ViewDimension) {
case D3D11_RTV_DIMENSION_TEXTURE2D:
return pDesc->Texture2D.PlaneSlice;
case D3D11_RTV_DIMENSION_TEXTURE2DARRAY:
return pDesc->Texture2DArray.PlaneSlice;
default:
return 0;
}
}
} }

6
src/d3d11/d3d11_view_rtv.h
View File

@ -66,12 +66,16 @@ namespace dxvk {
D3D11_RENDER_TARGET_VIEW_DESC1* pDesc); D3D11_RENDER_TARGET_VIEW_DESC1* pDesc);
static D3D11_RENDER_TARGET_VIEW_DESC1 PromoteDesc( static D3D11_RENDER_TARGET_VIEW_DESC1 PromoteDesc(
const D3D11_RENDER_TARGET_VIEW_DESC* pDesc); const D3D11_RENDER_TARGET_VIEW_DESC* pDesc,
UINT Plane);
static HRESULT NormalizeDesc( static HRESULT NormalizeDesc(
ID3D11Resource* pResource, ID3D11Resource* pResource,
D3D11_RENDER_TARGET_VIEW_DESC1* pDesc); D3D11_RENDER_TARGET_VIEW_DESC1* pDesc);
static UINT GetPlaneSlice(
const D3D11_RENDER_TARGET_VIEW_DESC1* pDesc);
private: private:
ID3D11Resource* m_resource; ID3D11Resource* m_resource;