wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 400dd1596ab7946e68278b3f8dc7c87b898c7e9f.

Browse Source
This commit is contained in:
Zebediah Figura
2018-11-30 20:00:04 -06:00
parent 4e9b9940d2
commit f828952b4b
4 changed files with 26 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/wined3d-UAV_Counters/0001-wined3d-Remaining-UAV-counter-changes.patch
View File

@@ -1,4 +1,4 @@
From 13401363be8ff9e23972450a115b212ce3059b07 Mon Sep 17 00:00:00 2001
From a1b44c071715bf9393e2e2da72ea987db7a4146e Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 9 Aug 2017 06:32:43 +0200
Subject: wined3d: Remaining UAV counter changes.
@@ -14,10 +14,10 @@ Based on patches by Michael Müller and Józef Kucia.
3 files changed, 11 insertions(+)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index ced9a13a8ae..2ccd71d5111 100644
index df754de1..abd7bbcf 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -1036,6 +1036,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D
@@ -1075,6 +1075,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D
TRACE("iface %p, dst_buffer %p, dst_offset %u, src_view %p.\n",
iface, dst_buffer, dst_offset, src_view);
@@ -28,10 +28,10 @@ index ced9a13a8ae..2ccd71d5111 100644
uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view);
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 6ea2fd27a7c..fcceccb6425 100644
index 5ea25e99..1417c07b 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2276,6 +2276,7 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *
@@ -2468,6 +2468,7 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *
context_release(context);
wined3d_resource_release(&op->buffer->resource);
@@ -39,19 +39,19 @@ index 6ea2fd27a7c..fcceccb6425 100644
}
void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer,
@@ -2290,6 +2291,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff
@@ -2482,6 +2483,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff
op->view = uav;
wined3d_resource_acquire(&dst_buffer->resource);
+ wined3d_resource_acquire(uav->resource);
cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT);
wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT);
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 31955badb10..1822ee1ef37 100644
index c90cbdbe..ebe396d7 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3974,6 +3974,12 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device,
@@ -4023,6 +4023,12 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device,
TRACE("device %p, dst_buffer %p, offset %u, uav %p.\n",
device, dst_buffer, offset, uav);
@@ -65,5 +65,5 @@ index 31955badb10..1822ee1ef37 100644
}
--
2.14.1
2.19.1