Henri Verbeet : d3d9: Introduce helpers to convert between d3d9 and wined3d query types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e61cd8e41d3fe620053dcd0b8d72d08120de939c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e61cd8e41d3fe620053dcd0b8...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Apr  2 15:23:02 2020 +0430

d3d9: Introduce helpers to convert between d3d9 and wined3d query types.

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d9/query.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c
index e9180fb481..207ad55e5a 100644
--- a/dlls/d3d9/query.c
+++ b/dlls/d3d9/query.c
@@ -24,6 +24,16 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
 
+static D3DQUERYTYPE d3dquerytype_from_wined3d(enum wined3d_query_type type)
+{
+    return (D3DQUERYTYPE)type;
+}
+
+static enum wined3d_query_type wined3d_query_type_from_d3d(D3DQUERYTYPE type)
+{
+    return (enum wined3d_query_type)type;
+}
+
 static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface)
 {
     return CONTAINING_RECORD(iface, struct d3d9_query, IDirect3DQuery9_iface);
@@ -98,7 +108,7 @@ static D3DQUERYTYPE WINAPI d3d9_query_GetType(IDirect3DQuery9 *iface)
     TRACE("iface %p.\n", iface);
 
     wined3d_mutex_lock();
-    type = wined3d_query_get_type(query->wined3d_query);
+    type = d3dquerytype_from_wined3d(wined3d_query_get_type(query->wined3d_query));
     wined3d_mutex_unlock();
 
     return type;
@@ -198,7 +208,7 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER
     query->refcount = 1;
 
     wined3d_mutex_lock();
-    if (FAILED(hr = wined3d_query_create(device->wined3d_device, type,
+    if (FAILED(hr = wined3d_query_create(device->wined3d_device, wined3d_query_type_from_d3d(type),
             query, &d3d9_null_wined3d_parent_ops, &query->wined3d_query)))
     {
         wined3d_mutex_unlock();