Henri Verbeet : wined3d: Get resource info from the texture in surface_load().

Alexandre Julliard julliard at wine.codeweavers.com
Thu Mar 17 10:02:13 CDT 2016


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Mar 16 18:17:00 2016 +0100

wined3d: Get resource info from the texture in surface_load().

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

---

 dlls/wined3d/surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ae89aef..3aeabed 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1606,7 +1606,7 @@ void surface_load(struct wined3d_surface *surface, struct wined3d_context *conte
 
     TRACE("surface %p, srgb %#x.\n", surface, srgb);
 
-    if (surface->resource.pool == WINED3D_POOL_SCRATCH)
+    if (surface->container->resource.pool == WINED3D_POOL_SCRATCH)
         ERR("Not supported on scratch surfaces.\n");
 
     if (surface->locations & location)




More information about the wine-cvs mailing list