Rebase against 3d5a2567977455d04e4896368a71db74e7b9074b.

This commit is contained in:
Zebediah Figura
2018-10-31 00:06:39 -05:00
parent b874b3656e
commit 6fc555874b
8 changed files with 71 additions and 72 deletions

View File

@@ -1,4 +1,4 @@
From dcc22d7ebd3f18465b541b72887e430f9a925b2b Mon Sep 17 00:00:00 2001
From 61838c8fd1fd47dbbe71c74946b652aa441b7e91 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 19 Feb 2017 00:57:12 +0100
Subject: [PATCH] wined3d: Add additional synchronization CS ops.
@@ -8,10 +8,10 @@ Subject: [PATCH] wined3d: Add additional synchronization CS ops.
1 file changed, 6 insertions(+)
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 1eebce6..ad649ec 100644
index 59a30ead..f4327373 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -750,6 +750,8 @@ static void wined3d_shader_resource_view_cs_init(void *object)
@@ -775,6 +775,8 @@ static void wined3d_shader_resource_view_cs_init(void *object)
debug_d3dformat(resource->format->id), debug_d3dformat(view_format->id));
}
}
@@ -20,7 +20,7 @@ index 1eebce6..ad649ec 100644
}
static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_view *view,
@@ -766,6 +768,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_
@@ -791,6 +793,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_
wined3d_resource_incref(view->resource = resource);
@@ -28,8 +28,8 @@ index 1eebce6..ad649ec 100644
wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view);
return WINED3D_OK;
@@ -1118,6 +1121,8 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture, view->format);
@@ -1145,6 +1148,8 @@ static void wined3d_unordered_access_view_cs_init(void *object)
desc, texture_gl, view->format);
}
}
+
@@ -37,7 +37,7 @@ index 1eebce6..ad649ec 100644
}
static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_access_view *view,
@@ -1134,6 +1139,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
@@ -1161,6 +1166,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
wined3d_resource_incref(view->resource = resource);
@@ -46,5 +46,5 @@ index 1eebce6..ad649ec 100644
return WINED3D_OK;
--
2.7.4
2.19.1