Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_depth_blt_fbo().
Alexandre Julliard
julliard at winehq.org
Tue Aug 2 17:33:32 CDT 2016
Module: wine
Branch: master
Commit: 6c7eeeee32cb06fd95196a6cb6e0693da9dcb9fe
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7eeeee32cb06fd95196a6cb6e0693da9dcb9fe
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Aug 2 12:26:33 2016 +0200
wined3d: Use wined3d_texture_load_location() in surface_depth_blt_fbo().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/surface.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ab4ee17..8ae4b73 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -401,6 +401,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect)
{
unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface);
+ unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface);
struct wined3d_texture *dst_texture = dst_surface->container;
struct wined3d_texture *src_texture = src_surface->container;
const struct wined3d_gl_info *gl_info;
@@ -448,9 +449,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device,
/* Make sure the locations are up-to-date. Loading the destination
* surface isn't required if the entire surface is overwritten. */
- surface_load_location(src_surface, context, src_location);
+ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location);
if (!surface_is_full_rect(dst_surface, dst_rect))
- surface_load_location(dst_surface, context, dst_location);
+ wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location);
else
wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location);
More information about the wine-cvs
mailing list