Józef Kucia : wined3d: Change wined3d_buffer_copy() return type to void.

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Fri Aug  4 19:53:51 2017 +0200

wined3d: Change wined3d_buffer_copy() return type to void.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/buffer.c          | 4 +---
 dlls/wined3d/cs.c              | 5 ++---
 dlls/wined3d/wined3d_private.h | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index b299fe7..e953e9a 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1191,7 +1191,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer)
     }
 }

-HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset,
+void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset,
         struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size)
 {
     struct wined3d_bo_address dst, src;
@@ -1213,8 +1213,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_
     context_release(context);

wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size);
-
-    return WINED3D_OK;
 }

void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context,
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index bc1bf17..a76598f 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1952,10 +1952,9 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void *

if (op->dst_resource->type == WINED3D_RTYPE_BUFFER)
     {
-        if (FAILED(wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left,
+        wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left,
                 buffer_from_resource(op->src_resource), op->src_box.left,
-                op->src_box.right - op->src_box.left)))
-            ERR("Failed to copy buffer.\n");
+                op->src_box.right - op->src_box.left);
     }
     else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D)
     {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f17cc76..f8aeb62 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3568,7 +3568,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *
 BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer,
         struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
 BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN;
-HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset,
+void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset,
         struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN;
 void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context,
         const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;