Rebase against 41d01871fef296dc717cf2c4f0bdbb07f5266acd.

This commit is contained in:
Sebastian Lackner
2016-06-16 22:56:56 +02:00
parent 4f532d23bb
commit 243a9f7b89
5 changed files with 33 additions and 317 deletions

View File

@@ -7059,7 +7059,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
}
return refcount;
@@ -193,6 +203,7 @@
@@ -201,6 +211,7 @@
return refcount;
}
@@ -7067,7 +7067,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
void wined3d_shader_resource_view_destroy_cs(struct wined3d_shader_resource_view *view)
{
if (view->object)
@@ -210,6 +221,7 @@
@@ -218,6 +229,7 @@
HeapFree(GetProcessHeap(), 0, view);
}
@@ -7075,7 +7075,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view)
{
ULONG refcount = InterlockedDecrement(&view->refcount);
@@ -218,6 +230,7 @@
@@ -226,6 +238,7 @@
if (!refcount)
{
@@ -7083,7 +7083,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
struct wined3d_device *device = view->resource->device;
/* Call wined3d_object_destroyed() before releasing the resource,
@@ -225,6 +238,24 @@
@@ -233,6 +246,24 @@
view->parent_ops->wined3d_object_destroyed(view->parent);
wined3d_resource_decref(view->resource);
wined3d_cs_emit_shader_resource_view_destroy(device->cs, view);