Module: wine Branch: master Commit: 0dc88185bca47dda1d8ddf4474da2f2fe6982237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc88185bca47dda1d8ddf4474...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue Apr 19 18:34:09 2016 +0200
wined3d: Use wined3d_texture_prepare_location() in wined3d_volume_load_location().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/volume.c | 10 +--------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9798650..ce3809f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -27,14 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);
-/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) -{ - return wined3d_texture_prepare_location(volume->container, volume->texture_level, context, location); -} - /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -222,7 +214,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, return FALSE; }
- if (!wined3d_volume_prepare_location(volume, context, location)) + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) return FALSE;
if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f04484..1b3e368 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2610,8 +2610,6 @@ HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_textur const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;