Henri Verbeet : wined3d: Use wined3d_texture_upload_data() in wined3d_device_update_texture_3d().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1cc4d8486b817681ff7e519a2ff190f52edf1c97
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1cc4d8486b817681ff7e519a2f...

Author: Henri Verbeet 
Date:   Mon Aug  1 12:49:03 2016 +0200

wined3d: Use wined3d_texture_upload_data() in wined3d_device_update_texture_3d().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/device.c          | 2 +-
 dlls/wined3d/texture.c         | 2 +-
 dlls/wined3d/wined3d_private.h | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index dfcebc0..1ada36e 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3607,7 +3607,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device,

data.buffer_object = 0;
         data.addr = src.data;
-        wined3d_volume_upload_data(dst_texture, i, context, &data);
+        wined3d_texture_upload_data(dst_texture, i, context, &data, src.row_pitch, src.slice_pitch);
         wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB);

if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i)))
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 4a9ed42..51b02d8 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1426,7 +1426,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
     return WINED3D_OK;
 }

-static void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
+void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
         const struct wined3d_context *context, const struct wined3d_const_bo_address *data,
         unsigned int row_pitch, unsigned int slice_pitch)
 {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index e933909..c1bc638 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2768,6 +2768,9 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture,
         struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
 void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data,
         const struct wined3d_gl_info *gl_info, GLenum binding) DECLSPEC_HIDDEN;
+void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
+        const struct wined3d_context *context, const struct wined3d_const_bo_address *data,
+        unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN;
 void wined3d_texture_validate_location(struct wined3d_texture *texture,
         unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;