wined3d: Rename struct wined3d_map_range to struct wined3d_range.

dlls/wined3d/adapter_gl.c

@@ -4617,7 +4617,7 @@ static void *adapter_gl_map_bo_address(struct wined3d_context *context,
 }
 
 static void adapter_gl_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data,
-        uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges)
+        uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges)
 {
     struct wined3d_context_gl *context_gl;
     GLenum binding;

dlls/wined3d/adapter_vk.c

@@ -538,7 +538,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context,
 }
 
 static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data,
-        uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges)
+        uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges)
 {
     const struct wined3d_vk_info *vk_info;
     struct wined3d_device_vk *device_vk;
@@ -556,7 +556,7 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context,
         const struct wined3d_bo_address *dst, uint32_t dst_bind_flags,
         const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size)
 {
-    struct wined3d_map_range range;
+    struct wined3d_range range;
     void *dst_ptr, *src_ptr;
 
     src_ptr = adapter_vk_map_bo_address(context, src, size, src_bind_flags, WINED3D_MAP_READ);

dlls/wined3d/buffer.c

@@ -611,7 +611,7 @@ static void wined3d_buffer_unload_location(struct wined3d_buffer *buffer,
 BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer,
         struct wined3d_context *context, DWORD location)
 {
-    struct wined3d_map_range range;
+    struct wined3d_range range;
 
     TRACE("buffer %p, context %p, location %s.\n",
             buffer, context, wined3d_debug_location(location));
@@ -1215,7 +1215,7 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off
 void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context,
         const struct wined3d_box *box, const void *data)
 {
-    struct wined3d_map_range range;
+    struct wined3d_range range;
 
     if (box)
     {
@@ -1406,13 +1406,13 @@ static void wined3d_buffer_no3d_unload_location(struct wined3d_buffer *buffer,
 }
 
 static void wined3d_buffer_no3d_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context,
-        const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges)
+        const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges)
 {
     FIXME("Not implemented.\n");
 }
 
 static void wined3d_buffer_no3d_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context,
-        void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges)
+        void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges)
 {
     FIXME("Not implemented.\n");
 }
@@ -1482,12 +1482,12 @@ static void wined3d_buffer_gl_unload_location(struct wined3d_buffer *buffer,
 
 /* Context activation is done by the caller. */
 static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context,
-        const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges)
+        const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges)
 {
     struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
     struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer);
     const struct wined3d_gl_info *gl_info = context_gl->gl_info;
-    const struct wined3d_map_range *range;
+    const struct wined3d_range *range;
 
     wined3d_buffer_gl_bind(buffer_gl, context_gl);
 
@@ -1502,12 +1502,12 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc
 
 /* Context activation is done by the caller. */
 static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context,
-        void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges)
+        void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges)
 {
     struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
     struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer);
     const struct wined3d_gl_info *gl_info = context_gl->gl_info;
-    const struct wined3d_map_range *range;
+    const struct wined3d_range *range;
 
     wined3d_buffer_gl_bind(buffer_gl, context_gl);
 
@@ -1636,13 +1636,13 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer,
 }
 
 static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context,
-        const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges)
+        const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges)
 {
     FIXME("Not implemented.\n");
 }
 
 static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context,
-        void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges)
+        void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges)
 {
     FIXME("Not implemented.\n");
 }

dlls/wined3d/context.c

@@ -2931,7 +2931,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl,
 }
 
 void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data,
-        GLenum binding, unsigned int range_count, const struct wined3d_map_range *ranges)
+        GLenum binding, unsigned int range_count, const struct wined3d_range *ranges)
 {
     const struct wined3d_gl_info *gl_info;
     unsigned int i;
@@ -2960,7 +2960,7 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl,
         const struct wined3d_bo_address *src, GLenum src_binding, size_t size)
 {
     const struct wined3d_gl_info *gl_info;
-    struct wined3d_map_range range;
+    struct wined3d_range range;
     BYTE *dst_ptr, *src_ptr;
 
     gl_info = context_gl->gl_info;

dlls/wined3d/directx.c

@@ -2463,7 +2463,7 @@ static void *adapter_no3d_map_bo_address(struct wined3d_context *context,
 }
 
 static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data,
-        uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges)
+        uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges)
 {
     if (data->buffer_object)
         ERR("Unsupported buffer object %#lx.\n", data->buffer_object);

dlls/wined3d/surface.c

@@ -649,7 +649,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr
     {
         unsigned int dst_row_pitch, dst_slice_pitch;
         struct wined3d_bo_address dst_data;
-        struct wined3d_map_range range;
+        struct wined3d_range range;
         const BYTE *src;
         BYTE *dst;
 
@@ -1638,8 +1638,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int
     unsigned int src_fmt_flags, dst_fmt_flags;
     struct wined3d_map_desc dst_map, src_map;
     unsigned int x, sx, xinc, y, sy, yinc;
-    struct wined3d_map_range dst_range;
     struct wined3d_context *context;
+    struct wined3d_range dst_range;
     unsigned int texture_level;
     HRESULT hr = WINED3D_OK;
     BOOL same_sub_resource;
@@ -2157,8 +2157,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view,
     struct wined3d_context *context;
     struct wined3d_texture *texture;
     struct wined3d_bo_address data;
-    struct wined3d_map_range range;
     struct wined3d_map_desc map;
+    struct wined3d_range range;
     DWORD map_binding;
     uint8_t *dst;
     DWORD c;

dlls/wined3d/texture.c

@@ -761,9 +761,9 @@ static void wined3d_texture_destroy_dc(void *object)
     struct wined3d_texture *texture;
     struct wined3d_dc_info *dc_info;
     struct wined3d_bo_address data;
-    struct wined3d_map_range range;
     unsigned int sub_resource_idx;
     struct wined3d_device *device;
+    struct wined3d_range range;
     NTSTATUS status;
 
     texture = idx->texture;
@@ -3219,7 +3219,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso
     struct wined3d_context *context;
     struct wined3d_texture *texture;
     struct wined3d_bo_address data;
-    struct wined3d_map_range range;
+    struct wined3d_range range;
 
     TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
 

dlls/wined3d/wined3d_private.h

@@ -1899,7 +1899,7 @@ struct wined3d_gl_view
     GLuint name;
 };
 
-struct wined3d_map_range
+struct wined3d_range
 {
     unsigned int offset;
     unsigned int size;
@@ -2158,7 +2158,7 @@ void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl,
         const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN;
 void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN;
 void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data,
-        GLenum binding, unsigned int range_count, const struct wined3d_map_range *ranges) DECLSPEC_HIDDEN;
+        GLenum binding, unsigned int range_count, const struct wined3d_range *ranges) DECLSPEC_HIDDEN;
 void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl,
         const struct wined3d_state *state) DECLSPEC_HIDDEN;
 
@@ -2858,7 +2858,7 @@ struct wined3d_adapter_ops
     void *(*adapter_map_bo_address)(struct wined3d_context *context,
             const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags);
     void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data,
-            uint32_t bind_flags, unsigned int range_count, const struct wined3d_map_range *ranges);
+            uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges);
     void (*adapter_copy_bo_address)(struct wined3d_context *context,
             const struct wined3d_bo_address *dst, uint32_t dst_bind_flags,
             const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size);
@@ -4172,9 +4172,9 @@ struct wined3d_buffer_ops
     void (*buffer_unload_location)(struct wined3d_buffer *buffer,
             struct wined3d_context *context, unsigned int location);
     void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data,
-            unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges);
+            unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges);
     void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data,
-            unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges);
+            unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges);
 };
 
 struct wined3d_buffer
@@ -4188,7 +4188,7 @@ struct wined3d_buffer
     void *map_ptr;
     uintptr_t buffer_object;
 
-    struct wined3d_map_range *maps;
+    struct wined3d_range *maps;
     SIZE_T maps_size, modified_areas;
     struct wined3d_fence *fence;
 
@@ -5270,7 +5270,7 @@ static inline void *wined3d_context_map_bo_address(struct wined3d_context *conte
 
 static inline void wined3d_context_unmap_bo_address(struct wined3d_context *context,
         const struct wined3d_bo_address *data, uint32_t bind_flags,
-        unsigned int range_count, const struct wined3d_map_range *ranges)
+        unsigned int range_count, const struct wined3d_range *ranges)
 {
     context->device->adapter->adapter_ops->adapter_unmap_bo_address(context, data, bind_flags, range_count, ranges);
 }