=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Initialize the map binding in resource_init.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Aug 26 15:20:29 CDT 2014


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue Aug 26 10:35:48 2014 +0200

wined3d: Initialize the map binding in resource_init.

---

 dlls/wined3d/resource.c | 1 +
 dlls/wined3d/surface.c  | 1 -
 dlls/wined3d/volume.c   | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 4247cd7..772ce10 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -110,6 +110,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
     resource->parent = parent;
     resource->parent_ops = parent_ops;
     resource->resource_ops = resource_ops;
+    resource->map_binding = WINED3D_LOCATION_SYSMEM;
 
     if (size)
     {
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 69ec1a1..04ef3f0 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6006,7 +6006,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text
     if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE)
         surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU;
 
-    surface->resource.map_binding = WINED3D_LOCATION_SYSMEM;
     surface->texture_target = target;
     surface->texture_level = level;
     surface->texture_layer = layer;
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index f98ea68..17ac554 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -824,7 +824,6 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture
 
     volume->texture_level = level;
     volume->locations = WINED3D_LOCATION_DISCARDED;
-    volume->resource.map_binding = WINED3D_LOCATION_SYSMEM;
 
     if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC
             && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]




More information about the wine-cvs mailing list