Henri Verbeet : d3d9: Use resource mapping functions in d3d9_device_DrawIndexedPrimitiveUP().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Thu Sep  1 20:34:45 2016 +0200

d3d9: Use resource mapping functions in d3d9_device_DrawIndexedPrimitiveUP().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d9/device.c        | 29 +++++++++++++++++------------
 dlls/wined3d/buffer.c     |  4 ++--
 dlls/wined3d/wined3d.spec |  2 --
 include/wine/wined3d.h    |  2 --
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index cb67fe6..c3f3007 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2458,11 +2458,12 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa
 {
     struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
     HRESULT hr;
-    BYTE *buffer_data;
-
     UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count);
     UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4;
     UINT idx_size = idx_count * idx_fmt_size;
+    struct wined3d_map_desc wined3d_map_desc;
+    struct wined3d_box wined3d_box = {0};
+    struct wined3d_resource *ib, *vb;
     UINT ib_pos;

UINT vtx_size = vertex_count * vertex_stride;
@@ -2500,12 +2501,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa
     else
         vb_pos += align;

-    hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &buffer_data,
-            vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD);
-    if (FAILED(hr))
+    wined3d_box.left = vb_pos;
+    wined3d_box.right = vb_pos + vtx_size;
+    vb = wined3d_buffer_get_resource(device->vertex_buffer);
+    if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box,
+            vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))
         goto done;
-    memcpy(buffer_data, vertex_data, vtx_size);
-    wined3d_buffer_unmap(device->vertex_buffer);
+    memcpy(wined3d_map_desc.data, vertex_data, vtx_size);
+    wined3d_resource_unmap(vb, 0);
     device->vertex_buffer_pos = vb_pos + vtx_size;

hr = d3d9_device_prepare_index_buffer(device, idx_size);
@@ -2520,12 +2523,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa
     else
         ib_pos += align;

-    hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &buffer_data,
-            ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD);
-    if (FAILED(hr))
+    wined3d_box.left = ib_pos;
+    wined3d_box.right = ib_pos + idx_size;
+    ib = wined3d_buffer_get_resource(device->index_buffer);
+    if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box,
+            ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))
         goto done;
-    memcpy(buffer_data, index_data, idx_size);
-    wined3d_buffer_unmap(device->index_buffer);
+    memcpy(wined3d_map_desc.data, index_data, idx_size);
+    wined3d_resource_unmap(ib, 0);
     device->index_buffer_pos = ib_pos + idx_size;

hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride);
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 56bfdfe..fdecb04 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -935,7 +935,7 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe
     return &buffer->resource;
 }

-HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags)
+static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags)
 {
     LONG count;
     BYTE *base;
@@ -1037,7 +1037,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN
     return WINED3D_OK;
 }

-void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer)
+static void wined3d_buffer_unmap(struct wined3d_buffer *buffer)
 {
     ULONG i;

diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 0db371d..b034ba8 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -29,8 +29,6 @@
 @ cdecl wined3d_buffer_get_parent(ptr)
 @ cdecl wined3d_buffer_get_resource(ptr)
 @ cdecl wined3d_buffer_incref(ptr)
-@ cdecl wined3d_buffer_map(ptr long long ptr long)
-@ cdecl wined3d_buffer_unmap(ptr)

@ cdecl wined3d_device_acquire_focus_window(ptr ptr)
 @ cdecl wined3d_device_begin_scene(ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 81dffea..f2900a9 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2139,8 +2139,6 @@ ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer);
 void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer);
 struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer);
 ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer);
-HRESULT __cdecl wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags);
-void __cdecl wined3d_buffer_unmap(struct wined3d_buffer *buffer);

HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window);
 HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device);