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] Use meta clear for ClearUnorderedAccessView* methods

Browse Source
This commit is contained in:
Philip Rebohle 2018-04-11 23:39:12 +02:00
parent 9d84e1bfaa
commit ef4a3c5bfc
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
1 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/d3d11/d3d11_context.cpp
View File

@ -531,10 +531,18 @@ namespace dxvk {
if (uav == nullptr) if (uav == nullptr)
return; return;
VkClearColorValue clearValue;
clearValue.uint32[0] = Values[0];
clearValue.uint32[1] = Values[1];
clearValue.uint32[2] = Values[2];
clearValue.uint32[3] = Values[3];
if (uav->GetResourceType() == D3D11_RESOURCE_DIMENSION_BUFFER) { if (uav->GetResourceType() == D3D11_RESOURCE_DIMENSION_BUFFER) {
const Rc<DxvkBufferView> bufferView = uav->GetBufferView(); const Rc<DxvkBufferView> bufferView = uav->GetBufferView();
if (bufferView->info().format == VK_FORMAT_R32_UINT) { if (bufferView->info().format == VK_FORMAT_R32_UINT
|| bufferView->info().format == VK_FORMAT_R32_SINT
|| bufferView->info().format == VK_FORMAT_R32_SFLOAT) {
EmitCs([ EmitCs([
cClearValue = Values[0], cClearValue = Values[0],
cDstSlice = bufferView->slice() cDstSlice = bufferView->slice()
@ -546,23 +554,33 @@ namespace dxvk {
cClearValue); cClearValue);
}); });
} else { } else {
Logger::err("D3D11: ClearUnorderedAccessViewUint: Not supported for typed buffers"); // FIXME Create integer-typed view if the
// buffer view has a floating point format
Rc<DxvkBufferView> bufferView = uav->GetBufferView();
EmitCs([
cClearValue = clearValue,
cDstView = bufferView
] (DxvkContext* ctx) {
ctx->clearBufferView(
cDstView, 0,
cDstView->elementCount(),
cClearValue);
});
} }
} else { } else {
// FIXME floating point formats are not handled correctly // FIXME Create integer-typed view if the
// yet, we might need to create an image view with an // image view has a floating point format
// integer format and clear that. Rc<DxvkImageView> imageView = uav->GetImageView();
VkClearColorValue clearValue;
for (uint32_t i = 0; i < 4; i++)
clearValue.uint32[i] = Values[i];
EmitCs([ EmitCs([
cClearValue = clearValue, cClearValue = clearValue,
cDstView = uav->GetImageView() cDstView = imageView
] (DxvkContext* ctx) { ] (DxvkContext* ctx) {
ctx->clearColorImage(cDstView->image(), ctx->clearImageView(cDstView,
cClearValue, cDstView->subresources()); VkOffset3D { 0, 0, 0 },
cDstView->mipLevelExtent(0),
cClearValue);
}); });
} }
} }
@ -571,7 +589,38 @@ namespace dxvk {
void STDMETHODCALLTYPE D3D11DeviceContext::ClearUnorderedAccessViewFloat( void STDMETHODCALLTYPE D3D11DeviceContext::ClearUnorderedAccessViewFloat(
ID3D11UnorderedAccessView* pUnorderedAccessView, ID3D11UnorderedAccessView* pUnorderedAccessView,
const FLOAT Values[4]) { const FLOAT Values[4]) {
Logger::err("D3D11DeviceContext::ClearUnorderedAccessViewFloat: Not implemented"); auto uav = static_cast<D3D11UnorderedAccessView*>(pUnorderedAccessView);
if (uav == nullptr)
return;
VkClearColorValue clearValue;
clearValue.float32[0] = Values[0];
clearValue.float32[1] = Values[1];
clearValue.float32[2] = Values[2];
clearValue.float32[3] = Values[3];
if (uav->GetResourceType() == D3D11_RESOURCE_DIMENSION_BUFFER) {
EmitCs([
cClearValue = clearValue,
cDstView = uav->GetBufferView()
] (DxvkContext* ctx) {
ctx->clearBufferView(
cDstView, 0,
cDstView->elementCount(),
cClearValue);
});
} else {
EmitCs([
cClearValue = clearValue,
cDstView = uav->GetImageView()
] (DxvkContext* ctx) {
ctx->clearImageView(cDstView,
VkOffset3D { 0, 0, 0 },
cDstView->mipLevelExtent(0),
cClearValue);
});
}
} }