wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

wined3d-CSMT_Main: Enforce memory limit for CSMT blocks.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-02-23 02:29:00 +01:00
parent 2ae8a0be02
commit 4136b55f1c
3 changed files with 81 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patchinstall.sh
View File

@ -8444,6 +8444,7 @@ if test "$enable_wined3d_CSMT_Main" -eq 1; then
printf '%s\n' '+ { "Michael Müller", "wined3d: Set all default state values to zero.", 1 },';
printf '%s\n' '+ { "Michael Müller", "wined3d: Improve wined3d_cs_emit_update_sub_resource.", 1 },';
printf '%s\n' '+ { "Michael Müller", "wined3d: Discard buffer during upload when replacing complete content.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Enforce a memory limit of about 16 MB for CSMT blocks.", 1 },';
) >> "$patchlist"
fi

49
patches/wined3d-CSMT_Main/0047-wined3d-Enforce-a-memory-limit-of-about-16-MB-for-CS.patch Normal file
View File

@ -0,0 +1,49 @@
From e7bbfe3b2bac3311d455b16b7f67ae1fec4f3c1f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 23 Feb 2017 02:22:46 +0100
Subject: wined3d: Enforce a memory limit of about 16 MB for CSMT blocks.
---
dlls/wined3d/cs.c | 10 ++++++----
dlls/wined3d/wined3d_private.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index b5b2d94e619..ce0306bdb71 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -2713,13 +2713,15 @@ static struct wined3d_cs_block *wined3d_cs_get_block(struct wined3d_cs *cs, stru
{
struct wined3d_cs_block *block;
- if (!(block = wined3d_cs_list_dequeue(&cs->free_list)))
+ while (!(block = wined3d_cs_list_dequeue(&cs->free_list)))
{
- if (!(block = HeapAlloc(GetProcessHeap(), 0, sizeof(*block))))
+ if (cs->num_blocks < 1024 && /* limit memory usage to about 16 MB */
+ (block = HeapAlloc(GetProcessHeap(), 0, sizeof(*block))))
{
- ERR("Failed to get new block.\n");
- return NULL;
+ cs->num_blocks++;
+ break;
}
+ while (!InterlockedCompareExchange(&cs->free_list.count, 0, 0));
}
block->pos = 0;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 74032096a60..ad999649965 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3252,6 +3252,7 @@ struct wined3d_cs
struct wined3d_cs_list free_list;
struct wined3d_cs_list exec_list;
struct wined3d_cs_list exec_prio_list;
+ LONG num_blocks;
LONG pending_presents;
--
2.11.0

59
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -2060,13 +2060,13 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
op->hr = &hr;
+#if !defined(STAGING_CSMT)
+ cs->ops->submit(cs);
cs->ops->submit(cs);
+#else /* STAGING_CSMT */
+ cs->ops->submit_and_wait(cs);
+
+ return hr;
+}
+
return hr;
}
+static const struct
+{
+ size_t offset;
@ -2228,7 +2228,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
+
+ wined3d_resource_acquire(view->resource);
+
cs->ops->submit(cs);
+ cs->ops->submit(cs);
+}
+
+static UINT wined3d_cs_exec_update_texture(struct wined3d_cs *cs, const void *data)
@ -2450,10 +2450,10 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
+ op->hr = &hr;
+
+ cs->ops->submit_and_wait(cs);
return hr;
}
+
+ return hr;
+}
+
+static UINT wined3d_cs_exec_create_swapchain_context(struct wined3d_cs *cs, const void *data)
+{
+ const struct wined3d_cs_create_swapchain_context *op = data;
@ -2694,7 +2694,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p,
unsigned int start_idx, unsigned int count, const void *constants)
{
@@ -1757,15 +3212,269 @@ static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_pus
@@ -1757,15 +3212,271 @@ static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_pus
for (i = 0, context_count = device->context_count; i < context_count; ++i)
{
device->contexts[i]->constant_update_mask |= push_constant_info[p].mask;
@ -2725,14 +2725,14 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
+ {
+ LeaveCriticalSection(&list->lock);
+ return NULL;
+ }
}
+ list_remove(head);
+ LeaveCriticalSection(&list->lock);
+ InterlockedDecrement(&list->count);
+
+ return LIST_ENTRY(head, struct wined3d_cs_block, entry);
+}
+
}
+static void wined3d_cs_wait_event(struct wined3d_cs *cs)
+{
+ InterlockedExchange(&cs->waiting_for_event, TRUE);
@ -2754,9 +2754,9 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
+ {
+ WaitForSingleObject(cs->event, INFINITE);
+#endif /* STAGING_CSMT */
}
}
+ }
+}
+
+#if !defined(STAGING_CSMT)
static const struct wined3d_cs_ops wined3d_cs_st_ops =
{
@ -2813,13 +2813,15 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
+{
+ struct wined3d_cs_block *block;
+
+ if (!(block = wined3d_cs_list_dequeue(&cs->free_list)))
+ while (!(block = wined3d_cs_list_dequeue(&cs->free_list)))
+ {
+ if (!(block = HeapAlloc(GetProcessHeap(), 0, sizeof(*block))))
+ if (cs->num_blocks < 1024 && /* limit memory usage to about 16 MB */
+ (block = HeapAlloc(GetProcessHeap(), 0, sizeof(*block))))
+ {
+ ERR("Failed to get new block.\n");
+ return NULL;
+ cs->num_blocks++;
+ break;
+ }
+ while (!InterlockedCompareExchange(&cs->free_list.count, 0, 0));
+ }
+
+ block->pos = 0;
@ -2964,7 +2966,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device)
{
@@ -1775,15 +3484,22 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device)
@@ -1775,15 +3486,22 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device)
if (!(cs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cs))))
return NULL;
@ -2987,7 +2989,7 @@ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
cs->ops = &wined3d_cs_st_ops;
cs->device = device;
@@ -1791,18 +3507,65 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device)
@@ -1791,18 +3509,65 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device)
if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size)))
{
state_cleanup(&cs->state);
@ -5909,7 +5911,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_cs_ops
{
void *(*require_space)(struct wined3d_cs *cs, size_t size);
@@ -3174,32 +3277,114 @@ struct wined3d_cs_ops
@@ -3174,32 +3277,115 @@ struct wined3d_cs_ops
void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p,
unsigned int start_idx, unsigned int count, const void *constants);
};
@ -5962,6 +5964,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
+ struct wined3d_cs_list free_list;
+ struct wined3d_cs_list exec_list;
+ struct wined3d_cs_list exec_prio_list;
+ LONG num_blocks;
+
+ LONG pending_presents;
+
@ -6024,7 +6027,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx,
const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;
@@ -3216,6 +3401,10 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B
@@ -3216,6 +3402,10 @@ void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, B
void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_predication(struct wined3d_cs *cs,
struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN;
@ -6035,7 +6038,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs,
struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs,
@@ -3247,19 +3436,37 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
@@ -3247,19 +3437,37 @@ void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, enum wined
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
@ -6073,7 +6076,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
* fixed function semantics as D3DCOLOR or FLOAT16 */
@@ -3397,7 +3604,12 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_
@@ -3397,7 +3605,12 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_
struct wined3d_swapchain_ops
{
void (*swapchain_present)(struct wined3d_swapchain *swapchain,
@ -6086,7 +6089,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain);
};
@@ -3434,6 +3646,10 @@ struct wined3d_swapchain
@@ -3434,6 +3647,10 @@ struct wined3d_swapchain
void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN;
struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;