Rebase against e918c6fd8b426e8298eca5951d917960e4236d95.

This commit is contained in:
Sebastian Lackner
2017-03-03 05:40:34 +01:00
parent 04a8307d45
commit 88c85f01c3
6 changed files with 22 additions and 86 deletions

View File

@@ -4302,7 +4302,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view);
return WINED3D_OK;
@@ -760,6 +767,10 @@ static void wined3d_unordered_access_view_cs_init(void *object)
@@ -774,6 +781,10 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture, view->format);
}
}
@@ -4313,7 +4313,7 @@ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
}
static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view,
@@ -776,6 +787,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
@@ -790,6 +801,9 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
wined3d_resource_incref(view->resource = resource);