=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Fix race condition while dumping DXBC shaders.
Alexandre Julliard
julliard at winehq.org
Mon Oct 8 15:38:52 CDT 2018
Module: vkd3d
Branch: master
Commit: 07d115b1d472e70822a39641ee66ba3dd71ad92c
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=07d115b1d472e70822a39641ee66ba3dd71ad92c
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Oct 8 15:40:20 2018 +0200
vkd3d: Fix race condition while dumping DXBC shaders.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d/state.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index b60cebf..1d18c31 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -1203,11 +1203,14 @@ struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12Pipeline
static void dump_shader(const char *path, const char *prefix, const void *data, size_t size)
{
- static unsigned int shader_id = 0;
+ static int shader_id = 0;
char filename[1024];
+ unsigned int id;
FILE *f;
- snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, shader_id);
+ id = InterlockedIncrement(&shader_id) - 1;
+
+ snprintf(filename, ARRAY_SIZE(filename), "%s/vkd3d-shader-%s-%u.dxbc", path, prefix, id);
if (!(f = fopen(filename, "wb")))
{
ERR("Failed to open %s for dumping shader.\n", filename);
@@ -1218,8 +1221,6 @@ static void dump_shader(const char *path, const char *prefix, const void *data,
ERR("Failed to write shader to %s.\n", filename);
if (fclose(f))
ERR("Failed to close stream %s.\n", filename);
-
- ++shader_id;
}
static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, size_t size)
More information about the wine-cvs
mailing list