Commit 694cdcc4 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Move the "map_binding" field from struct wined3d_surface to struct wined3d_resource.

Like "draw_binding".
parent ed230a42
...@@ -734,8 +734,8 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub ...@@ -734,8 +734,8 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub
struct wined3d_surface *surface = surface_from_resource(sub_resource); struct wined3d_surface *surface = surface_from_resource(sub_resource);
surface_prepare_map_memory(surface); surface_prepare_map_memory(surface);
surface_load_location(surface, surface->map_binding); surface_load_location(surface, surface->resource.map_binding);
surface_invalidate_location(surface, ~surface->map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding);
} }
static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource) static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource)
......
...@@ -2037,6 +2037,7 @@ struct wined3d_resource ...@@ -2037,6 +2037,7 @@ struct wined3d_resource
enum wined3d_pool pool; enum wined3d_pool pool;
DWORD access_flags; DWORD access_flags;
DWORD draw_binding; DWORD draw_binding;
DWORD map_binding;
UINT width; UINT width;
UINT height; UINT height;
UINT depth; UINT depth;
...@@ -2233,7 +2234,6 @@ struct wined3d_surface ...@@ -2233,7 +2234,6 @@ struct wined3d_surface
const struct wined3d_surface_ops *surface_ops; const struct wined3d_surface_ops *surface_ops;
struct wined3d_texture *container; struct wined3d_texture *container;
struct wined3d_swapchain *swapchain; struct wined3d_swapchain *swapchain;
DWORD map_binding;
void *user_memory; void *user_memory;
DWORD locations; DWORD locations;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment