wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data().

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

wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data().
1419a068 · Henri Verbeet · Alexandre Julliard · 400a0dcc · 1419a068 · 1419a068
Commit 1419a068 authored Aug 16, 2019 by Henri Verbeet Committed by Alexandre Julliard Aug 16, 2019
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

texture.c dlls/wined3d/texture.c +0 -0

wined3d_private.h dlls/wined3d/wined3d_private.h +0 -4

No files found.
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3666,10 +3666,6 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture,
 void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN;
 void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture,
        HWND window, RECT *rect) DECLSPEC_HIDDEN;
-void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
-        struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box,
-        const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch,
-        unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN;
 void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx,
        unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, struct wined3d_texture *src_texture,
        unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) DECLSPEC_HIDDEN;