=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Print FIXME() about ignoring initial UAV count values only when necessary.
Alexandre Julliard
julliard at winehq.org
Mon Mar 6 15:25:08 CST 2017
Module: wine
Branch: master
Commit: b768560e498468c343e32d11b6a54414ba8c151f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b768560e498468c343e32d11b6a54414ba8c151f
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Mar 3 01:30:37 2017 +0100
d3d11: Print FIXME() about ignoring initial UAV count values only when necessary.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d11/device.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 6269c68..958dcfe 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -654,9 +654,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord
if (unordered_access_view_count != D3D11_KEEP_UNORDERED_ACCESS_VIEWS)
{
- if (initial_counts)
- FIXME("Ignoring initial counts.\n");
-
wined3d_mutex_lock();
for (i = 0; i < unordered_access_view_start_slot; ++i)
{
@@ -667,6 +664,12 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord
struct d3d11_unordered_access_view *view
= unsafe_impl_from_ID3D11UnorderedAccessView(unordered_access_views[i]);
+ if (initial_counts && view && view->desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER
+ && (view->desc.u.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER))
+ && initial_counts[i] != ~(UINT)0)
+ FIXME("Ignoring initial count %u for slot %u.\n",
+ initial_counts[i], unordered_access_view_start_slot + i);
+
wined3d_device_set_unordered_access_view(device->wined3d_device,
unordered_access_view_start_slot + i,
view ? view->wined3d_view : NULL);
@@ -1226,14 +1229,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(
TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n",
iface, start_slot, view_count, views, initial_counts);
- if (initial_counts)
- FIXME("Ignoring initial counts.\n");
-
wined3d_mutex_lock();
for (i = 0; i < view_count; ++i)
{
struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(views[i]);
+ if (initial_counts && view && view->desc.ViewDimension == D3D11_UAV_DIMENSION_BUFFER
+ && (view->desc.u.Buffer.Flags & (D3D11_BUFFER_UAV_FLAG_APPEND | D3D11_BUFFER_UAV_FLAG_COUNTER))
+ && initial_counts[i] != ~(UINT)0)
+ FIXME("Ignoring initial count %u for slot %u.\n", initial_counts[i], start_slot + i);
+
wined3d_device_set_cs_uav(device->wined3d_device, start_slot + i,
view ? view->wined3d_view : NULL);
}
More information about the wine-cvs
mailing list