=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Remove redundant size checks before memcpy().

Alexandre Julliard julliard at winehq.org
Wed Apr 25 15:11:16 CDT 2018


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Wed Apr 25 11:23:50 2018 +0200

wined3d: Remove redundant size checks before memcpy().

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/wined3d/cs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index b0572ab..dc07f52 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -986,8 +986,7 @@ void wined3d_cs_emit_set_viewports(struct wined3d_cs *cs, unsigned int viewport_
     op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_viewports, viewports[viewport_count]),
             WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_VIEWPORTS;
-    if (viewport_count)
-        memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports));
+    memcpy(op->viewports, viewports, viewport_count * sizeof(*viewports));
     op->viewport_count = viewport_count;
 
     cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT);
@@ -1012,8 +1011,7 @@ void wined3d_cs_emit_set_scissor_rects(struct wined3d_cs *cs, unsigned int rect_
     op = cs->ops->require_space(cs, FIELD_OFFSET(struct wined3d_cs_set_scissor_rects, rects[rect_count]),
             WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECTS;
-    if (rect_count)
-        memcpy(op->rects, rects, rect_count * sizeof(*rects));
+    memcpy(op->rects, rects, rect_count * sizeof(*rects));
     op->rect_count = rect_count;
 
     cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT);




More information about the wine-cvs mailing list