[PATCH 3/3] wined3d: Make the "counter_bo" field of struct wined3d_unordered_access_view a wined3d_bo pointer.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/wined3d/buffer.c          | 2 +-
 dlls/wined3d/cs.c              | 2 +-
 dlls/wined3d/texture.c         | 2 +-
 dlls/wined3d/view.c            | 8 ++++----
 dlls/wined3d/wined3d_private.h | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 3dd1c20eef4..315ea05260e 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -1132,7 +1132,7 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi
 {
     if (upload_bo->flags & UPLOAD_BO_RENAME_ON_UNMAP)
     {
-        wined3d_buffer_set_bo(buffer, context, (struct wined3d_bo *)upload_bo->addr.buffer_object);
+        wined3d_buffer_set_bo(buffer, context, upload_bo->addr.buffer_object);
         wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER);
         wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER);
     }
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 262123b5d90..1a6ca2b8c7a 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -3130,7 +3130,7 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str
                 return false;
         }
 
-        bo = (const struct wined3d_bo *)client->addr.buffer_object;
+        bo = client->addr.buffer_object;
         map_ptr = bo ? bo->map_ptr : NULL;
         map_ptr += (uintptr_t)client->addr.addr;
 
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 9eacec3a91e..7e2da350f5a 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -2476,7 +2476,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context,
             return;
     }
 
-    bo.buffer_object = (struct wined3d_bo *)src_bo_addr->buffer_object;
+    bo.buffer_object = src_bo_addr->buffer_object;
     bo.addr = (BYTE *)src_bo_addr->addr + src_box->front * src_slice_pitch;
     if (dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS)
     {
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 79dbc847249..b902812aded 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -1616,7 +1616,7 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v
     src.buffer_object = 0;
     src.addr = (void *)&value;
 
-    dst.buffer_object = (struct wined3d_bo *)view->counter_bo;
+    dst.buffer_object = view->counter_bo;
     dst.addr = NULL;
 
     wined3d_context_copy_bo_address(context, &dst, &src, sizeof(uint32_t));
@@ -1632,7 +1632,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_
     if (!view->counter_bo)
         return;
 
-    src.buffer_object = (struct wined3d_bo *)view->counter_bo;
+    src.buffer_object = view->counter_bo;
     src.addr = NULL;
 
     wined3d_buffer_copy_bo_address(buffer, context, offset, &src, sizeof(uint32_t));
@@ -1670,7 +1670,7 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object)
         {
             struct wined3d_bo_gl *bo = &view_gl->counter_bo;
 
-            view_gl->v.counter_bo = (uintptr_t)bo;
+            view_gl->v.counter_bo = &bo->b;
             wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), GL_ATOMIC_COUNTER_BUFFER,
                     GL_STATIC_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo);
             wined3d_unordered_access_view_set_counter(&view_gl->v, 0);
@@ -2253,7 +2253,7 @@ static void wined3d_unordered_access_view_vk_cs_init(void *object)
             {
                 TRACE("Created counter buffer view 0x%s.\n", wine_dbgstr_longlong(uav_vk->vk_counter_view));
 
-                uav_vk->v.counter_bo = (uintptr_t)&uav_vk->counter_bo;
+                uav_vk->v.counter_bo = &uav_vk->counter_bo.b;
             }
         }
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6e7899b5329..0e2a9e586b5 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -5314,7 +5314,7 @@ struct wined3d_unordered_access_view
     const struct wined3d_format *format;
 
     struct wined3d_view_desc desc;
-    uintptr_t counter_bo;
+    struct wined3d_bo *counter_bo;
 };
 
 void wined3d_unordered_access_view_cleanup(struct wined3d_unordered_access_view *view) DECLSPEC_HIDDEN;
-- 
2.33.0