Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_depth_fill().
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 17 10:02:13 CDT 2016
Module: wine
Branch: master
Commit: d9ebc2e21586a20337aaf9a4056d9ff8afc8bd1a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ebc2e21586a20337aaf9a4056d9ff8afc8bd1a
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Mar 16 18:16:55 2016 +0100
wined3d: Get resource info from the texture in wined3d_surface_depth_fill().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/surface.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index dcc946c..f59dee9 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -936,11 +936,13 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const
static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect,
struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect)
{
- struct wined3d_device *device = src_surface->resource.device;
+ struct wined3d_texture *src_texture = src_surface->container;
+ struct wined3d_texture *dst_texture = dst_surface->container;
+ struct wined3d_device *device = src_texture->resource.device;
if (!fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_BLIT,
- src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format,
- dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))
+ src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format,
+ dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format))
return WINED3DERR_INVALIDCALL;
surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect);
More information about the wine-cvs
mailing list