wine-devel August 2020

wine-devel@winehq.org

78 participants
638 discussions

[PATCH 1/6] ole32/tests: Add tests for HGLOBAL based IStream::Clone.
by Huw Davies 11 Aug '20

11 Aug '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 199 +++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 6a0498aa60b..1825fa9c1e4 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -2,6 +2,7 @@ * Stream on HGLOBAL Tests * * Copyright 2006 Robert Shearman (for CodeWeavers) + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -514,9 +515,207 @@ static void test_freed_hglobal(void) IStream_Release(pStream); } +static void stream_info(IStream *stream, HGLOBAL *hmem, int *size, int *pos) +{ + HRESULT hr; + STATSTG stat; + LARGE_INTEGER offset; + ULARGE_INTEGER newpos; + + *hmem = 0; + *size = *pos = -1; + + hr = GetHGlobalFromStream(stream, hmem); + ok(hr == S_OK, "unexpected %#x\n", hr); + + memset(&stat, 0x55, sizeof(stat)); + hr = IStream_Stat(stream, &stat, STATFLAG_DEFAULT); + ok(hr == S_OK, "unexpected %#x\n", hr); + ok(stat.type == STGTY_STREAM, "unexpected %#x\n", stat.type); + ok(!stat.pwcsName, "unexpected %p\n", stat.pwcsName); + ok(IsEqualIID(&stat.clsid, &GUID_NULL), "unexpected %s\n", wine_dbgstr_guid(&stat.clsid)); + ok(!stat.cbSize.HighPart, "unexpected %#x\n", stat.cbSize.HighPart); + *size = stat.cbSize.LowPart; + + offset.QuadPart = 0; + hr = IStream_Seek(stream, offset, STREAM_SEEK_CUR, &newpos); + ok(hr == S_OK, "unexpected %#x\n", hr); + ok(!newpos.HighPart, "unexpected %#x\n", newpos.HighPart); + *pos = newpos.LowPart; +} + +static void test_IStream_Clone(void) +{ + static const char hello[] = "Hello World!"; + char buf[32]; + HRESULT hr; + IStream *stream, *clone; + HGLOBAL orig_hmem, hmem, hmem_clone; + ULARGE_INTEGER newsize; + LARGE_INTEGER offset; + int size, pos, ret; + + /* test simple case for Clone */ + orig_hmem = GlobalAlloc(GMEM_MOVEABLE, 0); + ok(orig_hmem != 0, "unexpected %p\n", orig_hmem); + hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 0, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Write(stream, hello, sizeof(hello), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 13, "unexpected %d\n", size); + ok(pos == 13, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 13, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + buf[0] = 0; + hr = IStream_Read(clone, buf, sizeof(buf), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); +todo_wine + ok(!strcmp(buf, hello), "wrong stream contents\n"); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(stream, newsize); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 13, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); +todo_wine + ok(pos == 13, "unexpected %d\n", pos); + + IStream_Release(clone); + IStream_Release(stream); + + /* exploit GMEM_FIXED forced move for the same base streams */ + orig_hmem = GlobalAlloc(GMEM_FIXED, 1); + ok(orig_hmem != 0, "unexpected %p\n", orig_hmem); + hr = CreateStreamOnHGlobal(orig_hmem, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem == orig_hmem, "handles should match\n"); + ok(size == 1, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); + ok(size == 1, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(stream, newsize); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem != 0, "unexpected %p\n", hmem); +todo_wine + ok(hmem != orig_hmem, "unexpected %p\n", hmem); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + IStream_Release(stream); + IStream_Release(clone); + + /* test Release of cloned stream */ + hr = CreateStreamOnHGlobal(0, TRUE, &stream); + ok(hr == S_OK, "unexpected %#x\n", hr); + + hr = IStream_Clone(stream, &clone); + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(stream, &hmem, &size, &pos); + ok(hmem != 0, "unexpected %p\n", hmem); + ok(size == 0, "unexpected %d\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); + ok(size == 0, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + ret = IStream_Release(stream); + ok(ret == 0, "unexpected %d\n", ret); + + newsize.QuadPart = 0x8000; + hr = IStream_SetSize(clone, newsize); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); + ok(pos == 0, "unexpected %d\n", pos); + + hr = IStream_Write(clone, hello, sizeof(hello), NULL); +todo_wine + ok(hr == S_OK, "unexpected %#x\n", hr); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); +todo_wine + ok(pos == 13, "unexpected %d\n", pos); + + offset.QuadPart = 0; + hr = IStream_Seek(clone, offset, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); + + buf[0] = 0; + hr = IStream_Read(clone, buf, sizeof(buf), NULL); + ok(hr == S_OK, "unexpected %#x\n", hr); +todo_wine + ok(!strcmp(buf, hello), "wrong stream contents\n"); + + stream_info(clone, &hmem_clone, &size, &pos); + ok(hmem_clone == hmem, "handles should match\n"); +todo_wine + ok(size == 0x8000, "unexpected %#x\n", size); +todo_wine + ok(pos == 32, "unexpected %d\n", pos); + + ret = IStream_Release(clone); + ok(ret == 0, "unexpected %d\n", ret); +} + START_TEST(hglobalstream) { test_streamonhglobal(); test_copyto(); test_freed_hglobal(); + test_IStream_Clone(); } -- 2.23.0

1 0

[PATCH vkd3d 3/5] vkd3d-compiler: Add an option to specify the target type.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5baaf8a..ed4b0ee 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -131,6 +131,8 @@ static void print_usage(const char *program_name) "[options...] file\n" "Options:\n" " -h, --help Display this information and exit.\n" + " -b <type> Specify the target type. Currently the only valid value\n" + " is 'spirv-binary'.\n" " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" " Valid values are 'buffer-texture' (default) and\n" " 'storage-buffer'.\n" @@ -153,6 +155,7 @@ struct options const char *filename; const char *output_filename; enum vkd3d_shader_source_type source_type; + enum vkd3d_shader_target_type target_type; bool print_version; bool print_source_types; bool print_target_types; @@ -222,6 +225,19 @@ static enum vkd3d_shader_source_type parse_source_type(const char *source) return VKD3D_SHADER_SOURCE_NONE; } +static enum vkd3d_shader_target_type parse_target_type(const char *target) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(target_type_info); ++i) + { + if (!strcmp(target, target_type_info[i].name)) + return target_type_info[i].type; + } + + return VKD3D_SHADER_TARGET_NONE; +} + static bool parse_command_line(int argc, char **argv, struct options *options) { enum vkd3d_shader_compile_option_buffer_uav buffer_uav; @@ -241,14 +257,23 @@ static bool parse_command_line(int argc, char **argv, struct options *options) memset(options, 0, sizeof(*options)); options->source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + options->target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; for (;;) { - if ((option = getopt_long(argc, argv, "ho:Vx:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "b:ho:Vx:", long_options, NULL)) == -1) break; switch (option) { + case 'b': + if ((options->target_type = parse_target_type(optarg)) == VKD3D_SHADER_TARGET_NONE) + { + fprintf(stderr, "Invalid target type '%s' specified.\n", optarg); + return false; + } + break; + case OPTION_BUFFER_UAV: if (!parse_buffer_uav(&buffer_uav, optarg)) { @@ -391,7 +416,7 @@ int main(int argc, char **argv) info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; - info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; + info.target_type = options.target_type; info.options = options.compile_options; info.option_count = options.compile_option_count; info.log_level = VKD3D_SHADER_LOG_INFO; -- 2.11.0

2 1

[PATCH vkd3d 2/5] vkd3d-compiler: Add an option to list the supported target types.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4a889f0..5baaf8a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Józef Kucia for CodeWeavers + * Copyright 2020 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,6 +36,7 @@ enum OPTION_BUFFER_UAV, OPTION_OUTPUT, OPTION_PRINT_SOURCE_TYPES, + OPTION_PRINT_TARGET_TYPES, OPTION_STRIP_DEBUG, OPTION_VERSION, }; @@ -52,6 +54,19 @@ source_type_info[] = " This is the format used for Direct3D shader model 4 and 5 shaders."}, }; +static const struct +{ + enum vkd3d_shader_target_type type; + const char *name; + const char *description; +} +target_type_info[] = +{ + {VKD3D_SHADER_TARGET_SPIRV_BINARY, + "spirv-binary", "A SPIR-V shader in binary form.\n" + " This is the format used for Vulkan shaders.\n"}, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -121,6 +136,8 @@ static void print_usage(const char *program_name) " 'storage-buffer'.\n" " -o, --output=<file> Write the output to <file>.\n" " --print-source-types Display the supported source types and exit.\n" + " --print-target-types Display the supported target types for the specified\n" + " source type and exit.\n" " --strip-debug Strip debug information from the output.\n" " -V, --version Display version information and exit.\n" " -x <type> Specify the type of the source. Valid values are\n" @@ -138,6 +155,7 @@ struct options enum vkd3d_shader_source_type source_type; bool print_version; bool print_source_types; + bool print_target_types; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -215,6 +233,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, {"output", required_argument, NULL, OPTION_OUTPUT}, {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, + {"print-target-types", no_argument, NULL, OPTION_PRINT_TARGET_TYPES}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, @@ -248,6 +267,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->print_source_types = true; return true; + case OPTION_PRINT_TARGET_TYPES: + options->print_target_types = true; + break; + case OPTION_STRIP_DEBUG: add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; @@ -270,6 +293,9 @@ static bool parse_command_line(int argc, char **argv, struct options *options) } } + if (options->print_target_types) + return true; + if (optind >= argc) return false; @@ -298,6 +324,36 @@ static void print_source_types(void) } } +static void print_target_types(enum vkd3d_shader_source_type source_type) +{ + const enum vkd3d_shader_target_type *target_types; + const char *source_type_name; + unsigned int count, i, j; + + for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) + { + if (source_type == source_type_info[i].type) + { + source_type_name = source_type_info[i].name; + break; + } + } + + target_types = vkd3d_shader_get_supported_target_types(source_type, &count); + fprintf(stdout, "Supported target types for source type '%s':\n", source_type_name); + for (i = 0; i < count; ++i) + { + for (j = 0; j < ARRAY_SIZE(target_type_info); ++j) + { + if (target_types[i] == target_type_info[j].type) + { + fprintf(stdout, " %s %s", target_type_info[j].name, target_type_info[j].description); + break; + } + } + } +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; @@ -326,6 +382,12 @@ int main(int argc, char **argv) return 0; } + if (options.print_target_types) + { + print_target_types(options.source_type); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; -- 2.11.0

2 1

[PATCH vkd3d 1/5] vkd3d-compiler: Add an option to list the supported source types.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 91 +++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 18 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index e2f9ae5..4a889f0 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -34,10 +34,24 @@ enum OPTION_HELP = CHAR_MAX + 1, OPTION_BUFFER_UAV, OPTION_OUTPUT, + OPTION_PRINT_SOURCE_TYPES, OPTION_STRIP_DEBUG, OPTION_VERSION, }; +static const struct +{ + enum vkd3d_shader_source_type type; + const char *name; + const char *description; +} +source_type_info[] = +{ + {VKD3D_SHADER_SOURCE_DXBC_TPF, + "dxbc-tpf", "A 'Tokenized Program Format' shader embedded in a DXBC container.\n" + " This is the format used for Direct3D shader model 4 and 5 shaders."}, +}; + static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) { struct stat st; @@ -101,17 +115,18 @@ static void print_usage(const char *program_name) static const char usage[] = "[options...] file\n" "Options:\n" - " -h, --help Display this information and exit.\n" - " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" - " Valid values are 'buffer-texture' (default) and\n" - " 'storage-buffer'.\n" - " -o, --output=<file> Write the output to <file>.\n" - " --strip-debug Strip debug information from the output.\n" - " -V, --version Display version information and exit.\n" - " -x <type> Specify the type of the source. Valid values are\n" - " 'dxbc-tpf' and 'none'.\n" - " -- Stop option processing. Any subsequent argument is\n" - " interpreted as a filename.\n"; + " -h, --help Display this information and exit.\n" + " --buffer-uav=<type> Specify the buffer type to use for buffer UAV bindings.\n" + " Valid values are 'buffer-texture' (default) and\n" + " 'storage-buffer'.\n" + " -o, --output=<file> Write the output to <file>.\n" + " --print-source-types Display the supported source types and exit.\n" + " --strip-debug Strip debug information from the output.\n" + " -V, --version Display version information and exit.\n" + " -x <type> Specify the type of the source. Valid values are\n" + " 'dxbc-tpf' and 'none'.\n" + " -- Stop option processing. Any subsequent argument is\n" + " interpreted as a filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -122,6 +137,7 @@ struct options const char *output_filename; enum vkd3d_shader_source_type source_type; bool print_version; + bool print_source_types; struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; @@ -174,9 +190,17 @@ static bool parse_buffer_uav(enum vkd3d_shader_compile_option_buffer_uav *buffer static enum vkd3d_shader_source_type parse_source_type(const char *source) { - if (!strcmp(source, "dxbc-tpf") || !strcmp(source, "none")) + unsigned int i; + + if (!strcmp(source, "none")) return VKD3D_SHADER_SOURCE_DXBC_TPF; + for (i = 0; i < ARRAY_SIZE(source_type_info); ++i) + { + if (!strcmp(source, source_type_info[i].name)) + return source_type_info[i].type; + } + return VKD3D_SHADER_SOURCE_NONE; } @@ -187,12 +211,13 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"help", no_argument, NULL, OPTION_HELP}, - {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, - {"output", required_argument, NULL, OPTION_OUTPUT}, - {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"help", no_argument, NULL, OPTION_HELP}, + {"buffer-uav", required_argument, NULL, OPTION_BUFFER_UAV}, + {"output", required_argument, NULL, OPTION_OUTPUT}, + {"print-source-types", no_argument, NULL, OPTION_PRINT_SOURCE_TYPES}, + {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; memset(options, 0, sizeof(*options)); @@ -219,6 +244,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->output_filename = optarg; break; + case OPTION_PRINT_SOURCE_TYPES: + options->print_source_types = true; + return true; + case OPTION_STRIP_DEBUG: add_compile_option(options, VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG, 1); break; @@ -249,6 +278,26 @@ static bool parse_command_line(int argc, char **argv, struct options *options) return true; } +static void print_source_types(void) +{ + const enum vkd3d_shader_source_type *source_types; + unsigned int count, i, j; + + source_types = vkd3d_shader_get_supported_source_types(&count); + fputs("Supported source types:\n", stdout); + for (i = 0; i < count; ++i) + { + for (j = 0; j < ARRAY_SIZE(source_type_info); ++j) + { + if (source_types[i] == source_type_info[j].type) + { + fprintf(stdout, " %s %s\n", source_type_info[j].name, source_type_info[j].description); + break; + } + } + } +} + int main(int argc, char **argv) { struct vkd3d_shader_compile_info info; @@ -271,6 +320,12 @@ int main(int argc, char **argv) return 0; } + if (options.print_source_types) + { + print_source_types(); + return 0; + } + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; info.next = NULL; info.source_type = options.source_type; -- 2.11.0

2 1

[PATCH 6/6] explorer: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

2 1

[PATCH vkd3d 5/5] build: Link vkd3d-utils with PTHREAD_LIBS.
by Henri Verbeet 11 Aug '20

11 Aug '20

Since it uses pthread functions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fc10ba6..58b3174 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,7 +123,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:1:0 -libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la +libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map -- 2.11.0

1 0

[PATCH vkd3d 4/5] vkd3d-shader: Support register spaces for combined samplers.
by Henri Verbeet 11 Aug '20

11 Aug '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 75 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a7adc82..e4d8a50 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -175,7 +175,9 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_combined_resource_sampler { + unsigned int resource_space; unsigned int resource_index; + unsigned int sampler_space; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; unsigned int flags; /* vkd3d_shader_binding_flag */ diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9ef0430..70bcf95 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1841,10 +1841,17 @@ struct vkd3d_symbol_resource unsigned int idx; }; +struct vkd3d_symbol_sampler +{ + unsigned int id; +}; + struct vkd3d_symbol_combined_sampler { - unsigned int resource_idx; - unsigned int sampler_idx; + enum vkd3d_shader_register_type resource_type; + unsigned int resource_id; + unsigned int sampler_space; + unsigned int sampler_index; }; struct vkd3d_symbol_register_data @@ -1870,6 +1877,12 @@ struct vkd3d_symbol_resource_data uint32_t uav_counter_id; }; +struct vkd3d_symbol_sampler_data +{ + unsigned int register_space; + unsigned int register_index; +}; + struct vkd3d_symbol { struct rb_entry entry; @@ -1878,6 +1891,7 @@ struct vkd3d_symbol { VKD3D_SYMBOL_REGISTER, VKD3D_SYMBOL_RESOURCE, + VKD3D_SYMBOL_SAMPLER, VKD3D_SYMBOL_COMBINED_SAMPLER, } type; @@ -1885,6 +1899,7 @@ struct vkd3d_symbol { struct vkd3d_symbol_register reg; struct vkd3d_symbol_resource resource; + struct vkd3d_symbol_sampler sampler; struct vkd3d_symbol_combined_sampler combined_sampler; } key; @@ -1893,6 +1908,7 @@ struct vkd3d_symbol { struct vkd3d_symbol_register_data reg; struct vkd3d_symbol_resource_data resource; + struct vkd3d_symbol_sampler_data sampler; } info; }; @@ -1948,13 +1964,23 @@ static void vkd3d_symbol_make_resource(struct vkd3d_symbol *symbol, symbol->key.resource.idx = reg->idx[0].offset; } +static void vkd3d_symbol_make_sampler(struct vkd3d_symbol *symbol, + const struct vkd3d_shader_register *reg) +{ + symbol->type = VKD3D_SYMBOL_SAMPLER; + memset(&symbol->key, 0, sizeof(symbol->key)); + symbol->key.sampler.id = reg->idx[0].offset; +} + static void vkd3d_symbol_make_combined_sampler(struct vkd3d_symbol *symbol, - unsigned int resource_index, unsigned int sampler_index) + const struct vkd3d_shader_register *resource_reg, unsigned int sampler_space, unsigned int sampler_index) { symbol->type = VKD3D_SYMBOL_COMBINED_SAMPLER; memset(&symbol->key, 0, sizeof(symbol->key)); - symbol->key.combined_sampler.resource_idx = resource_index; - symbol->key.combined_sampler.sampler_idx = sampler_index; + symbol->key.combined_sampler.resource_type = resource_reg->type; + symbol->key.combined_sampler.resource_id = resource_reg->idx[0].offset; + symbol->key.combined_sampler.sampler_space = sampler_space; + symbol->key.combined_sampler.sampler_index = sampler_index; } static struct vkd3d_symbol *vkd3d_symbol_dup(const struct vkd3d_symbol *symbol) @@ -1977,6 +2003,9 @@ static const char *debug_vkd3d_symbol(const struct vkd3d_symbol *symbol) case VKD3D_SYMBOL_RESOURCE: return vkd3d_dbg_sprintf("resource %#x, %u", symbol->key.resource.type, symbol->key.resource.idx); + case VKD3D_SYMBOL_SAMPLER: + return vkd3d_dbg_sprintf("sampler %u", + symbol->key.sampler.id); default: return vkd3d_dbg_sprintf("type %#x", symbol->type); } @@ -2316,7 +2345,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ } static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) + const struct vkd3d_shader_resource *resource, const struct vkd3d_shader_sampler *sampler) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_combined_resource_sampler *combined_sampler; @@ -2325,7 +2354,7 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!shader_interface->combined_sampler_count) return false; - if (resource && resource->type == VKD3DSPR_UAV) + if (resource && resource->reg.reg.type == VKD3DSPR_UAV) return false; for (i = 0; i < shader_interface->combined_sampler_count; ++i) @@ -2335,8 +2364,10 @@ static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_com if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) continue; - if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) - && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) + if ((!resource || (combined_sampler->resource_space == resource->register_space + && combined_sampler->resource_index == resource->register_index)) + && (!sampler || (combined_sampler->sampler_space == sampler->register_space + && combined_sampler->sampler_index == sampler->register_index))) return true; } @@ -5160,7 +5191,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; - if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg)) + vkd3d_symbol_make_sampler(&reg_symbol, reg); + reg_symbol.info.sampler.register_space = sampler->register_space; + reg_symbol.info.sampler.register_index = sampler->register_index; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, sampler)) return; type_id = vkd3d_spirv_get_op_type_sampler(builder); @@ -5282,7 +5318,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ { current = &shader_interface->combined_samplers[i]; - if (current->resource_index != resource_index) + if (current->resource_space != resource_space || current->resource_index != resource_index) continue; if (!(current->flags & resource_type_flag)) @@ -5292,7 +5328,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ continue; d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, - VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, current->sampler_index); + VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, current->sampler_space, current->sampler_index); depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); @@ -5307,11 +5343,14 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &current->binding); if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) - vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_dummy_sampler", resource_space, resource_index); else - vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); + vkd3d_spirv_build_op_name(builder, var_id, "t%u_%u_s%u_%u", resource_space, resource_index, + current->sampler_space, current->sampler_index); - vkd3d_symbol_make_combined_sampler(&symbol, resource_index, current->sampler_index); + vkd3d_symbol_make_combined_sampler(&symbol, resource, + current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX ? 0 : current->sampler_space, + current->sampler_index); symbol.id = var_id; symbol.info.resource.register_space = resource_space; symbol.info.resource.register_index = resource_index; @@ -5350,7 +5389,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); - if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL)) + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, resource, NULL)) { vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, register_space, register_index, resource_type, sampled_type, structure_stride, raw, resource_type_info); @@ -7294,17 +7333,31 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; - unsigned int resource_index, sampler_index; + unsigned int sampler_space, sampler_index; struct vkd3d_symbol key; struct rb_entry *entry; if (!shader_interface->combined_sampler_count) return NULL; - resource_index = resource_reg->idx[0].offset; - sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_SHADER_DUMMY_SAMPLER_INDEX; + if (sampler_reg) + { + const struct vkd3d_symbol *sampler_symbol; + + vkd3d_symbol_make_sampler(&key, sampler_reg); + if (!(entry = rb_get(&compiler->symbol_table, &key))) + return NULL; + sampler_symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + sampler_space = sampler_symbol->info.sampler.register_space; + sampler_index = sampler_symbol->info.sampler.register_index; + } + else + { + sampler_space = 0; + sampler_index = VKD3D_SHADER_DUMMY_SAMPLER_INDEX; + } - vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); + vkd3d_symbol_make_combined_sampler(&key, resource_reg, sampler_space, sampler_index); if ((entry = rb_get(&compiler->symbol_table, &key))) return RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); return NULL; -- 2.11.0

1 0

[PATCH 4/6] winex11.drv: Zero initialize DEVMODE before passing it to EnumDisplaySettings().
by Zhiyi Zhang 11 Aug '20

11 Aug '20

EnumDisplaySettings() on Wine does not write beyond the end of DEVMODE because it doesn't use dmDriverExtra currently, but this implementation detail should not be relied on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a64d1de6500..2d1fc7220de 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -501,6 +501,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, if (!dev_mode) { + memset(&registry_mode, 0, sizeof(registry_mode)); registry_mode.dmSize = sizeof(registry_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_REGISTRY_SETTINGS, &registry_mode, 0)) goto done; @@ -512,6 +513,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = *dev_mode; if (!(dev_mode->dmFields & DM_POSITION)) { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done; @@ -522,6 +524,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, } else { + memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); if (!EnumDisplaySettingsExW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &current_mode, 0)) goto done; -- 2.25.1

2 1

[PATCH] ws2_32: Use kernelbase directly
by Alistair Leslie-Hughes 11 Aug '20

11 Aug '20

There is no need to go through kernel32 for these functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/ws2_32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 87e0bdfa2f..5b5d323a51 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -102,19 +102,19 @@ @ stdcall WSARecvDisconnect(long ptr) @ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) @ stdcall WSARemoveServiceClass(ptr) -@ stdcall WSAResetEvent(long) kernel32.ResetEvent +@ stdcall WSAResetEvent(long) kernelbase.ResetEvent @ stdcall WSASend(long ptr long ptr long ptr ptr) @ stdcall WSASendDisconnect(long ptr) @ stdcall WSASendMsg(long ptr long ptr ptr ptr) @ stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) -@ stdcall WSASetEvent(long) kernel32.SetEvent +@ stdcall WSASetEvent(long) kernelbase.SetEvent @ stdcall WSASetServiceA(ptr long long) @ stdcall WSASetServiceW(ptr long long) @ stdcall WSASocketA(long long long ptr long long) @ stdcall WSASocketW(long long long ptr long long) @ stdcall WSAStringToAddressA(str long ptr ptr ptr) @ stdcall WSAStringToAddressW(wstr long ptr ptr ptr) -@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WSAWaitForMultipleEvents(long ptr long long long) kernelbase.WaitForMultipleObjectsEx @ stdcall WSCDeinstallProvider(ptr ptr) @ stdcall WSCEnableNSProvider(ptr long) @ stdcall WSCEnumProtocols(ptr ptr ptr ptr) -- 2.28.0

3 4

[PATCH vkd3d v2] vkd3d-shader: Make VKD3D_SHADER_SWIZZLE more legible.
by Zebediah Figura 11 Aug '20

11 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++-------- libs/vkd3d-shader/dxbc.c | 3 +-- libs/vkd3d/state.c | 3 +-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index af97b04..a7adc82 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -738,14 +738,12 @@ struct vkd3d_shader_signature #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx)) #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ - (((x & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ - | ((y & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ - | ((z & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ - | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) - -#define VKD3D_SHADER_NO_SWIZZLE \ - VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_Y, \ - VKD3D_SHADER_SWIZZLE_Z, VKD3D_SHADER_SWIZZLE_W) + (((VKD3D_SHADER_SWIZZLE_ ## x) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## y) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## z) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## w) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) + +#define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) #ifndef VKD3D_SHADER_NO_PROTOTYPES diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1aa8a5c..81c1f48 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1669,8 +1669,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * { case VKD3D_SM4_SWIZZLE_NONE: if (shader_sm4_is_scalar_register(&src_param->reg)) - src_param->swizzle = VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X); + src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); else src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; break; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 449f242..a64d17f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1971,8 +1971,7 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *format) { if (format->dxgi_format == DXGI_FORMAT_A8_UNORM) - return VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_W, VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_Y, VKD3D_SHADER_SWIZZLE_Z); + return VKD3D_SHADER_SWIZZLE(W, X, Y, Z); return VKD3D_SHADER_NO_SWIZZLE; } -- 2.27.0

2 1

← Newer
1
...
41
42
43
44
45
46
47
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel August 2020