Henri Verbeet : wined3d: Store the "buffer_object" in struct wined3d_bo_address as an UINT_PTR.

Alexandre Julliard julliard at winehq.org
Tue Oct 23 16:10:01 CDT 2018


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Oct 23 12:36:39 2018 +0330

wined3d: Store the "buffer_object" in struct wined3d_bo_address as an UINT_PTR.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 127c7b3..6e60c5a 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4212,7 +4212,7 @@ const char *debug_const_bo_address(const struct wined3d_const_bo_address *addres
 {
     if (!address)
         return "(null)";
-    return wine_dbg_sprintf("{%#x:%p}", address->buffer_object, address->addr);
+    return wine_dbg_sprintf("{%#lx:%p}", address->buffer_object, address->addr);
 }
 
 const char *debug_bo_address(const struct wined3d_bo_address *address)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 8e31e41..33d248f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1461,13 +1461,13 @@ do {                                                                \
 
 struct wined3d_bo_address
 {
-    GLuint buffer_object;
+    UINT_PTR buffer_object;
     BYTE *addr;
 };
 
 struct wined3d_const_bo_address
 {
-    GLuint buffer_object;
+    UINT_PTR buffer_object;
     const BYTE *addr;
 };
 




More information about the wine-cvs mailing list