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 ae2d6e836b98440cdc938718226dc89592a64eda.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-08-17 15:54:43 +02:00
parent 2d92c18c9e
commit f6565eb6af
8 changed files with 25 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 421a9c0b534a902617188f3eb0e4f26ce8897613 Mon Sep 17 00:00:00 2001
From 851cedf6dc2daff577d1f301878be82a6e5e17ce 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.
@@ -11,14 +11,13 @@ Based on patches by Michael Müller and Józef Kucia.
dlls/d3d11/device.c | 3 +++
dlls/wined3d/cs.c | 4 +++-
dlls/wined3d/device.c | 6 ++++++
dlls/wined3d/view.c | 5 +----
4 files changed, 13 insertions(+), 5 deletions(-)
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 0f268dfed27..5f8d0f3ec13 100644
index ced9a13a8ae..2ccd71d5111 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -1026,6 +1026,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11D
@@ -1036,6 +1036,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);
@@ -29,10 +28,10 @@ index 0f268dfed27..5f8d0f3ec13 100644
uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view);
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index a76598ff4ca..39a85fa513d 100644
index 8961dfe1467..1a9a508fc21 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -1295,7 +1295,7 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con
@@ -1319,7 +1319,7 @@ static void wined3d_cs_exec_set_unordered_access_view(struct wined3d_cs *cs, con
device_invalidate_state(cs->device, STATE_UNORDERED_ACCESS_VIEW_BINDING(op->pipeline));
@@ -41,7 +40,7 @@ index a76598ff4ca..39a85fa513d 100644
wined3d_unordered_access_view_set_counter(op->view, op->initial_count);
}
@@ -2252,6 +2252,7 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *
@@ -2276,6 +2276,7 @@ static void wined3d_cs_exec_copy_uav_counter(struct wined3d_cs *cs, const void *
context_release(context);
wined3d_resource_release(&op->buffer->resource);
@@ -49,7 +48,7 @@ index a76598ff4ca..39a85fa513d 100644
}
void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer,
@@ -2266,6 +2267,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff
@@ -2290,6 +2291,7 @@ void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buff
op->view = uav;
wined3d_resource_acquire(&dst_buffer->resource);
@@ -58,10 +57,10 @@ index a76598ff4ca..39a85fa513d 100644
cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT);
}
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 30e7fbed02a..3ecd9952893 100644
index 31955badb10..1822ee1ef37 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3966,6 +3966,12 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device,
@@ -3974,6 +3974,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);
@@ -74,29 +73,6 @@ index 30e7fbed02a..3ecd9952893 100644
wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav);
}
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index f4f3b35f20c..896bc12bd32 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -953,7 +953,7 @@ static void wined3d_unordered_access_view_cs_init(void *object)
context = context_acquire(resource->device, NULL, 0);
gl_info = context->gl_info;
create_buffer_view(&view->gl_view, context, desc, buffer, view->format);
- if (desc->flags & WINED3D_VIEW_BUFFER_COUNTER)
+ if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER|WINED3D_VIEW_BUFFER_APPEND))
{
static const GLuint initial_value = 0;
GL_EXTCALL(glGenBuffers(1, &view->counter_bo));
@@ -994,9 +994,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces
return E_INVALIDARG;
view->desc = *desc;
- if (desc->flags & WINED3D_VIEW_BUFFER_APPEND)
- FIXME("Unhandled view flags %#x.\n", desc->flags);
-
wined3d_resource_incref(view->resource = resource);
wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view);
--
2.13.1