mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-02-20 19:54:19 +01:00
[d3d11] Refactor Unordered Access View Creation
Part 4 / 4 of the refactor.
This commit is contained in:
Philip Rebohle
parent
55203eb458
commit
871c96b130
@ -346,139 +346,17 @@ namespace dxvk {
|
|||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER) {
|
// Create the view if requested
|
||||||
auto resource = static_cast<D3D11Buffer*>(pResource);
|
|
||||||
|
|
||||||
D3D11_BUFFER_DESC resourceDesc;
|
|
||||||
resource->GetDesc(&resourceDesc);
|
|
||||||
|
|
||||||
DxvkBufferViewCreateInfo viewInfo;
|
|
||||||
|
|
||||||
if (desc.Buffer.Flags & D3D11_BUFFEREX_SRV_FLAG_RAW) {
|
|
||||||
viewInfo.format = VK_FORMAT_R32_UINT;
|
|
||||||
viewInfo.rangeOffset = sizeof(uint32_t) * desc.Buffer.FirstElement;
|
|
||||||
viewInfo.rangeLength = sizeof(uint32_t) * desc.Buffer.NumElements;
|
|
||||||
} else if (desc.Format == DXGI_FORMAT_UNKNOWN) {
|
|
||||||
viewInfo.format = VK_FORMAT_R32_UINT;
|
|
||||||
viewInfo.rangeOffset = resourceDesc.StructureByteStride * desc.Buffer.FirstElement;
|
|
||||||
viewInfo.rangeLength = resourceDesc.StructureByteStride * desc.Buffer.NumElements;
|
|
||||||
} else {
|
|
||||||
// Typed buffer view - must use an uncompressed color format
|
|
||||||
viewInfo.format = m_dxgiAdapter->LookupFormat(
|
|
||||||
desc.Format, DXGI_VK_FORMAT_MODE_COLOR).Format;
|
|
||||||
|
|
||||||
const DxvkFormatInfo* formatInfo = imageFormatInfo(viewInfo.format);
|
|
||||||
viewInfo.rangeOffset = formatInfo->elementSize * desc.Buffer.FirstElement;
|
|
||||||
viewInfo.rangeLength = formatInfo->elementSize * desc.Buffer.NumElements;
|
|
||||||
|
|
||||||
if (formatInfo->flags.test(DxvkFormatFlag::BlockCompressed)) {
|
|
||||||
Logger::err("D3D11Device: Compressed formats for buffer views not supported");
|
|
||||||
return E_INVALIDARG;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ppUAView == nullptr)
|
if (ppUAView == nullptr)
|
||||||
return S_FALSE;
|
return S_FALSE;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Fetch a buffer slice for atomic
|
*ppUAView = ref(new D3D11UnorderedAccessView(this, pResource, &desc));
|
||||||
// append/consume functionality.
|
|
||||||
DxvkBufferSlice counterSlice;
|
|
||||||
|
|
||||||
if (desc.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER))
|
|
||||||
counterSlice = AllocCounterSlice();
|
|
||||||
|
|
||||||
*ppUAView = ref(new D3D11UnorderedAccessView(
|
|
||||||
this, pResource, desc,
|
|
||||||
m_dxvkDevice->createBufferView(
|
|
||||||
resource->GetBufferSlice().buffer(), viewInfo),
|
|
||||||
counterSlice));
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
} catch (const DxvkError& e) {
|
} catch (const DxvkError& e) {
|
||||||
Logger::err(e.message());
|
Logger::err(e.message());
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
const D3D11CommonTexture* textureInfo = GetCommonTexture(pResource);
|
|
||||||
|
|
||||||
// Fill in the view info. The view type depends solely
|
|
||||||
// on the view dimension field in the view description,
|
|
||||||
// not on the resource type.
|
|
||||||
const DXGI_VK_FORMAT_INFO formatInfo = m_dxgiAdapter
|
|
||||||
->LookupFormat(desc.Format, textureInfo->GetFormatMode());
|
|
||||||
|
|
||||||
DxvkImageViewCreateInfo viewInfo;
|
|
||||||
viewInfo.format = formatInfo.Format;
|
|
||||||
viewInfo.aspect = formatInfo.Aspect;
|
|
||||||
viewInfo.swizzle = formatInfo.Swizzle;
|
|
||||||
viewInfo.usage = VK_IMAGE_USAGE_STORAGE_BIT;
|
|
||||||
|
|
||||||
switch (desc.ViewDimension) {
|
|
||||||
case D3D11_UAV_DIMENSION_TEXTURE1D:
|
|
||||||
viewInfo.type = VK_IMAGE_VIEW_TYPE_1D;
|
|
||||||
viewInfo.minLevel = desc.Texture1D.MipSlice;
|
|
||||||
viewInfo.numLevels = 1;
|
|
||||||
viewInfo.minLayer = 0;
|
|
||||||
viewInfo.numLayers = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case D3D11_UAV_DIMENSION_TEXTURE1DARRAY:
|
|
||||||
viewInfo.type = VK_IMAGE_VIEW_TYPE_1D_ARRAY;
|
|
||||||
viewInfo.minLevel = desc.Texture1DArray.MipSlice;
|
|
||||||
viewInfo.numLevels = 1;
|
|
||||||
viewInfo.minLayer = desc.Texture1DArray.FirstArraySlice;
|
|
||||||
viewInfo.numLayers = desc.Texture1DArray.ArraySize;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case D3D11_UAV_DIMENSION_TEXTURE2D:
|
|
||||||
viewInfo.type = VK_IMAGE_VIEW_TYPE_2D;
|
|
||||||
viewInfo.minLevel = desc.Texture2D.MipSlice;
|
|
||||||
viewInfo.numLevels = 1;
|
|
||||||
viewInfo.minLayer = 0;
|
|
||||||
viewInfo.numLayers = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case D3D11_UAV_DIMENSION_TEXTURE2DARRAY:
|
|
||||||
viewInfo.type = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
|
|
||||||
viewInfo.minLevel = desc.Texture2DArray.MipSlice;
|
|
||||||
viewInfo.numLevels = 1;
|
|
||||||
viewInfo.minLayer = desc.Texture2DArray.FirstArraySlice;
|
|
||||||
viewInfo.numLayers = desc.Texture2DArray.ArraySize;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case D3D11_UAV_DIMENSION_TEXTURE3D:
|
|
||||||
// FIXME we actually have to map this to a
|
|
||||||
// 2D array view in order to support W slices
|
|
||||||
viewInfo.type = VK_IMAGE_VIEW_TYPE_3D;
|
|
||||||
viewInfo.minLevel = desc.Texture3D.MipSlice;
|
|
||||||
viewInfo.numLevels = 1;
|
|
||||||
viewInfo.minLayer = 0;
|
|
||||||
viewInfo.numLayers = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
Logger::err(str::format(
|
|
||||||
"D3D11: View dimension not supported for UAV: ",
|
|
||||||
desc.ViewDimension));
|
|
||||||
return E_INVALIDARG;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ppUAView == nullptr)
|
|
||||||
return S_FALSE;
|
|
||||||
|
|
||||||
try {
|
|
||||||
*ppUAView = ref(new D3D11UnorderedAccessView(
|
|
||||||
this, pResource, desc,
|
|
||||||
m_dxvkDevice->createImageView(
|
|
||||||
textureInfo->GetImage(),
|
|
||||||
viewInfo),
|
|
||||||
DxvkBufferSlice()));
|
|
||||||
return S_OK;
|
|
||||||
} catch (const DxvkError& e) {
|
|
||||||
Logger::err(e.message());
|
|
||||||
return E_FAIL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -6,25 +6,100 @@
|
|||||||
namespace dxvk {
|
namespace dxvk {
|
||||||
|
|
||||||
D3D11UnorderedAccessView::D3D11UnorderedAccessView(
|
D3D11UnorderedAccessView::D3D11UnorderedAccessView(
|
||||||
D3D11Device* device,
|
D3D11Device* pDevice,
|
||||||
ID3D11Resource* resource,
|
ID3D11Resource* pResource,
|
||||||
const D3D11_UNORDERED_ACCESS_VIEW_DESC& desc,
|
const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc)
|
||||||
const Rc<DxvkBufferView>& bufferView,
|
: m_device(pDevice), m_resource(pResource), m_desc(*pDesc) {
|
||||||
const DxvkBufferSlice& counterSlice)
|
D3D11_RESOURCE_DIMENSION resourceDim = D3D11_RESOURCE_DIMENSION_UNKNOWN;
|
||||||
: m_device(device), m_resource(resource),
|
pResource->GetType(&resourceDim);
|
||||||
m_desc(desc), m_bufferView(bufferView),
|
|
||||||
m_counterSlice(counterSlice) { }
|
|
||||||
|
|
||||||
|
if (resourceDim == D3D11_RESOURCE_DIMENSION_BUFFER) {
|
||||||
|
auto buffer = static_cast<D3D11Buffer*>(pResource);
|
||||||
|
|
||||||
D3D11UnorderedAccessView::D3D11UnorderedAccessView(
|
DxvkBufferViewCreateInfo viewInfo;
|
||||||
D3D11Device* device,
|
|
||||||
ID3D11Resource* resource,
|
if (pDesc->Buffer.Flags & D3D11_BUFFEREX_SRV_FLAG_RAW) {
|
||||||
const D3D11_UNORDERED_ACCESS_VIEW_DESC& desc,
|
viewInfo.format = VK_FORMAT_R32_UINT;
|
||||||
const Rc<DxvkImageView>& imageView,
|
viewInfo.rangeOffset = sizeof(uint32_t) * pDesc->Buffer.FirstElement;
|
||||||
const DxvkBufferSlice& counterSlice)
|
viewInfo.rangeLength = sizeof(uint32_t) * pDesc->Buffer.NumElements;
|
||||||
: m_device(device), m_resource(resource),
|
} else if (pDesc->Format == DXGI_FORMAT_UNKNOWN) {
|
||||||
m_desc(desc), m_imageView(imageView),
|
viewInfo.format = VK_FORMAT_R32_UINT;
|
||||||
m_counterSlice(counterSlice) { }
|
viewInfo.rangeOffset = buffer->Desc()->StructureByteStride * pDesc->Buffer.FirstElement;
|
||||||
|
viewInfo.rangeLength = buffer->Desc()->StructureByteStride * pDesc->Buffer.NumElements;
|
||||||
|
} else {
|
||||||
|
viewInfo.format = pDevice->LookupFormat(pDesc->Format, DXGI_VK_FORMAT_MODE_COLOR).Format;
|
||||||
|
|
||||||
|
const DxvkFormatInfo* formatInfo = imageFormatInfo(viewInfo.format);
|
||||||
|
viewInfo.rangeOffset = formatInfo->elementSize * pDesc->Buffer.FirstElement;
|
||||||
|
viewInfo.rangeLength = formatInfo->elementSize * pDesc->Buffer.NumElements;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pDesc->Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER))
|
||||||
|
m_counterSlice = pDevice->AllocCounterSlice();
|
||||||
|
|
||||||
|
m_bufferView = pDevice->GetDXVKDevice()->createBufferView(
|
||||||
|
buffer->GetBuffer(), viewInfo);
|
||||||
|
} else {
|
||||||
|
const DXGI_VK_FORMAT_INFO formatInfo = pDevice->LookupFormat(
|
||||||
|
pDesc->Format, GetCommonTexture(pResource)->GetFormatMode());
|
||||||
|
|
||||||
|
DxvkImageViewCreateInfo viewInfo;
|
||||||
|
viewInfo.format = formatInfo.Format;
|
||||||
|
viewInfo.aspect = formatInfo.Aspect;
|
||||||
|
viewInfo.swizzle = formatInfo.Swizzle;
|
||||||
|
viewInfo.usage = VK_IMAGE_USAGE_STORAGE_BIT;
|
||||||
|
|
||||||
|
switch (pDesc->ViewDimension) {
|
||||||
|
case D3D11_UAV_DIMENSION_TEXTURE1D:
|
||||||
|
viewInfo.type = VK_IMAGE_VIEW_TYPE_1D;
|
||||||
|
viewInfo.minLevel = pDesc->Texture1D.MipSlice;
|
||||||
|
viewInfo.numLevels = 1;
|
||||||
|
viewInfo.minLayer = 0;
|
||||||
|
viewInfo.numLayers = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case D3D11_UAV_DIMENSION_TEXTURE1DARRAY:
|
||||||
|
viewInfo.type = VK_IMAGE_VIEW_TYPE_1D_ARRAY;
|
||||||
|
viewInfo.minLevel = pDesc->Texture1DArray.MipSlice;
|
||||||
|
viewInfo.numLevels = 1;
|
||||||
|
viewInfo.minLayer = pDesc->Texture1DArray.FirstArraySlice;
|
||||||
|
viewInfo.numLayers = pDesc->Texture1DArray.ArraySize;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case D3D11_UAV_DIMENSION_TEXTURE2D:
|
||||||
|
viewInfo.type = VK_IMAGE_VIEW_TYPE_2D;
|
||||||
|
viewInfo.minLevel = pDesc->Texture2D.MipSlice;
|
||||||
|
viewInfo.numLevels = 1;
|
||||||
|
viewInfo.minLayer = 0;
|
||||||
|
viewInfo.numLayers = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case D3D11_UAV_DIMENSION_TEXTURE2DARRAY:
|
||||||
|
viewInfo.type = VK_IMAGE_VIEW_TYPE_2D_ARRAY;
|
||||||
|
viewInfo.minLevel = pDesc->Texture2DArray.MipSlice;
|
||||||
|
viewInfo.numLevels = 1;
|
||||||
|
viewInfo.minLayer = pDesc->Texture2DArray.FirstArraySlice;
|
||||||
|
viewInfo.numLayers = pDesc->Texture2DArray.ArraySize;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case D3D11_UAV_DIMENSION_TEXTURE3D:
|
||||||
|
// FIXME we actually have to map this to a
|
||||||
|
// 2D array view in order to support W slices
|
||||||
|
viewInfo.type = VK_IMAGE_VIEW_TYPE_3D;
|
||||||
|
viewInfo.minLevel = pDesc->Texture3D.MipSlice;
|
||||||
|
viewInfo.numLevels = 1;
|
||||||
|
viewInfo.minLayer = 0;
|
||||||
|
viewInfo.numLayers = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw DxvkError("D3D11: Invalid view dimension for image UAV");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_imageView = pDevice->GetDXVKDevice()->createImageView(
|
||||||
|
GetCommonTexture(pResource)->GetImage(), viewInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
D3D11UnorderedAccessView::~D3D11UnorderedAccessView() {
|
D3D11UnorderedAccessView::~D3D11UnorderedAccessView() {
|
||||||
|
|||||||
@ -20,18 +20,9 @@ namespace dxvk {
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
D3D11UnorderedAccessView(
|
D3D11UnorderedAccessView(
|
||||||
D3D11Device* device,
|
D3D11Device* pDevice,
|
||||||
ID3D11Resource* resource,
|
ID3D11Resource* pResource,
|
||||||
const D3D11_UNORDERED_ACCESS_VIEW_DESC& desc,
|
const D3D11_UNORDERED_ACCESS_VIEW_DESC* pDesc);
|
||||||
const Rc<DxvkBufferView>& bufferView,
|
|
||||||
const DxvkBufferSlice& counterSlice);
|
|
||||||
|
|
||||||
D3D11UnorderedAccessView(
|
|
||||||
D3D11Device* device,
|
|
||||||
ID3D11Resource* resource,
|
|
||||||
const D3D11_UNORDERED_ACCESS_VIEW_DESC& desc,
|
|
||||||
const Rc<DxvkImageView>& imageView,
|
|
||||||
const DxvkBufferSlice& counterSlice);
|
|
||||||
|
|
||||||
~D3D11UnorderedAccessView();
|
~D3D11UnorderedAccessView();
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user