Matteo Bruni : d3d10: Use read_u32() implementation from d3dcompiler.

Alexandre Julliard julliard at winehq.org
Wed Feb 9 16:03:50 CST 2022


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

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Wed Feb  9 16:30:09 2022 +0100

d3d10: Use read_u32() implementation from d3dcompiler.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d10/d3d10_private.h |  1 +
 dlls/d3d10/effect.c        | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h
index 85f7bd51c97..9aabc2028e6 100644
--- a/dlls/d3d10/d3d10_private.h
+++ b/dlls/d3d10/d3d10_private.h
@@ -33,6 +33,7 @@
 
 #include "d3d10.h"
 #include "d3dcompiler.h"
+#include "utils.h"
 
 /*
  * This doesn't belong here, but for some functions it is possible to return that value,
diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
index df1c899e005..9ed964e1072 100644
--- a/dlls/d3d10/effect.c
+++ b/dlls/d3d10/effect.c
@@ -837,16 +837,6 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S
     return TRUE;
 }
 
-static uint32_t read_u32(const char **ptr)
-{
-    uint32_t u32;
-
-    memcpy(&u32, *ptr, sizeof(u32));
-    *ptr += sizeof(u32);
-
-    return u32;
-}
-
 static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size)
 {
     return !count || (data_size - offset) / count >= size;




More information about the wine-cvs mailing list