From 409991b9db95180d18bf351d7c0b03d4e4a3fd95 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Fri, 11 Oct 2019 17:15:33 +0200 Subject: [PATCH] [d3d10] Fix reported bind flags for D3D10 resources Turns out that the UAV bind flag remains set in the D3D10 description, even though D3D10 does not support the feature. Fixes wine test failures. --- src/d3d10/d3d10_buffer.cpp | 2 +- src/d3d10/d3d10_texture.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d3d10/d3d10_buffer.cpp b/src/d3d10/d3d10_buffer.cpp index e2b8162a..2bd089b0 100644 --- a/src/d3d10/d3d10_buffer.cpp +++ b/src/d3d10/d3d10_buffer.cpp @@ -105,7 +105,7 @@ namespace dxvk { pDesc->ByteWidth = d3d11Desc.ByteWidth; pDesc->Usage = D3D10_USAGE(d3d11Desc.Usage); - pDesc->BindFlags = d3d11Desc.BindFlags & 0x7F; + pDesc->BindFlags = d3d11Desc.BindFlags; pDesc->CPUAccessFlags = d3d11Desc.CPUAccessFlags; pDesc->MiscFlags = ConvertD3D11ResourceFlags(d3d11Desc.MiscFlags); } diff --git a/src/d3d10/d3d10_texture.cpp b/src/d3d10/d3d10_texture.cpp index d0622a75..d04267cb 100644 --- a/src/d3d10/d3d10_texture.cpp +++ b/src/d3d10/d3d10_texture.cpp @@ -111,7 +111,7 @@ namespace dxvk { pDesc->ArraySize = d3d11Desc.ArraySize; pDesc->Format = d3d11Desc.Format; pDesc->Usage = D3D10_USAGE(d3d11Desc.Usage); - pDesc->BindFlags = d3d11Desc.BindFlags & 0x7F; + pDesc->BindFlags = d3d11Desc.BindFlags; pDesc->CPUAccessFlags = d3d11Desc.CPUAccessFlags; pDesc->MiscFlags = ConvertD3D11ResourceFlags(d3d11Desc.MiscFlags); } @@ -224,7 +224,7 @@ namespace dxvk { pDesc->Format = d3d11Desc.Format; pDesc->SampleDesc = d3d11Desc.SampleDesc; pDesc->Usage = D3D10_USAGE(d3d11Desc.Usage); - pDesc->BindFlags = d3d11Desc.BindFlags & 0x7F; + pDesc->BindFlags = d3d11Desc.BindFlags; pDesc->CPUAccessFlags = d3d11Desc.CPUAccessFlags; pDesc->MiscFlags = ConvertD3D11ResourceFlags(d3d11Desc.MiscFlags); } @@ -337,7 +337,7 @@ namespace dxvk { pDesc->MipLevels = d3d11Desc.MipLevels; pDesc->Format = d3d11Desc.Format; pDesc->Usage = D3D10_USAGE(d3d11Desc.Usage); - pDesc->BindFlags = d3d11Desc.BindFlags & 0x7F; + pDesc->BindFlags = d3d11Desc.BindFlags; pDesc->CPUAccessFlags = d3d11Desc.CPUAccessFlags; pDesc->MiscFlags = ConvertD3D11ResourceFlags(d3d11Desc.MiscFlags); }