=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Simplify d3d10_query_GetData().

Alexandre Julliard julliard at winehq.org
Thu Aug 31 14:20:46 CDT 2017


Module: wine
Branch: master
Commit: c4aac1c005730ef080488c3b50edb371da1af2a0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c4aac1c005730ef080488c3b50edb371da1af2a0

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Thu Aug 31 09:04:38 2017 +0200

d3d11: Simplify d3d10_query_GetData().

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/async.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c
index ef8e63c..d37cbde 100644
--- a/dlls/d3d11/async.c
+++ b/dlls/d3d11/async.c
@@ -334,11 +334,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d
             && data_size == sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS))
     {
         data_size = sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS);
-        if (data)
-        {
-            d3d10_data_pointer = data;
-            data = &d3d11_data;
-        }
+        d3d10_data_pointer = data;
+        data = &d3d11_data;
     }
 
     wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags);




More information about the wine-cvs mailing list