wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Zebediah Figura : include: Document struct vkd3d_shader_compile_info and members.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: vkd3d Branch: master Commit: 139d979733df684093bc7927e3d20e8559e704a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=139d979733df684093bc792… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:28 2020 -0500 include: Document struct vkd3d_shader_compile_info and members. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 91 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 86 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index da05f2c..9150f14 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -57,13 +57,17 @@ enum vkd3d_shader_structure_type VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; -/* This also affects UAV counters in Vulkan environments. In OpenGL - * environments, atomic counter buffers are always used for UAV counters. */ +/** + * Determines how buffer UAVs are stored. + * + * This also affects UAV counters in Vulkan environments. In OpenGL + * environments, atomic counter buffers are always used for UAV counters. + */ enum vkd3d_shader_compile_option_buffer_uav { - /* Use buffer textures for buffer UAVs, this is the default. */ + /** Use buffer textures for buffer UAVs. This is the default value. */ VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_TEXEL_BUFFER = 0x00000000, - /* Use storage buffers for buffer UAVs. */ + /** Use storage buffers for buffer UAVs. */ VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV_STORAGE_BUFFER = 0x00000001, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV), @@ -71,15 +75,33 @@ enum vkd3d_shader_compile_option_buffer_uav enum vkd3d_shader_compile_option_name { + /** + * If \a value is nonzero, do not include debug information in the + * compiled shader. The default value is zero. + * + * This option is supported by vkd3d_shader_compile(). However, not all + * compilers support generating debug information. + */ VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG = 0x00000001, - VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, /* vkd3d_shader_compile_option_buffer_uav */ + /** \a value is a member of enum vkd3d_shader_compile_option_buffer_uav. */ + VKD3D_SHADER_COMPILE_OPTION_BUFFER_UAV = 0x00000002, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_NAME), }; +/** + * Various settings which may affect shader compilation or scanning, passed as + * part of struct vkd3d_shader_compile_info. For more details, see the + * documentation for individual options. + */ struct vkd3d_shader_compile_option { + /** Name of the option. */ enum vkd3d_shader_compile_option_name name; + /** + * A value associated with the option. The type and interpretation of the + * value depends on the option in question. + */ unsigned int value; }; @@ -97,9 +119,12 @@ enum vkd3d_shader_visibility VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; +/** A generic structure containing a GPU shader, in text or byte-code format. */ struct vkd3d_shader_code { + /** Pointer to the code. */ const void *code; + /** Size of \a code, in bytes. */ size_t size; }; @@ -264,46 +289,102 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { + /** + * The shader has no type or is to be ignored. This is not a valid value + * for vkd3d_shader_compile() or vkd3d_shader_scan(). + */ VKD3D_SHADER_SOURCE_NONE, + /** + * A 'Tokenized Program Format' shader embedded in a DXBC container. This is + * the format used for Direct3D shader model 4 and 5 shaders. + */ VKD3D_SHADER_SOURCE_DXBC_TPF, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), }; +/** The output format of a compiled shader. */ enum vkd3d_shader_target_type { + /** + * The shader has no type or is to be ignored. This is not a valid value + * for vkd3d_shader_compile() or vkd3d_shader_scan(). + */ VKD3D_SHADER_TARGET_NONE, + /** + * A SPIR-V shader in binary form. This is the format used for Vulkan + * shaders. + */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; +/** + * Describes the maximum severity of compilation messages returned by + * vkd3d_shader_compile() and similar functions. + */ enum vkd3d_shader_log_level { + /** No messages will be returned. */ VKD3D_SHADER_LOG_NONE, + /** Only fatal errors which prevent successful compilation will be returned. */ VKD3D_SHADER_LOG_ERROR, + /** Non-fatal warnings and fatal errors will be returned. */ VKD3D_SHADER_LOG_WARNING, + /** + * All messages, including general informational messages, will be returned. + */ VKD3D_SHADER_LOG_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_LOG_LEVEL), }; +/** + * A chained structure containing compilation parameters. + */ struct vkd3d_shader_compile_info { + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO. */ enum vkd3d_shader_structure_type type; + /** + * Optional pointer to a structure containing further parameters. For a list + * of valid structures, refer to the respective function documentation. If + * no further parameters are needed, this field should be set to NULL. + */ const void *next; + /** Input source code or byte code. */ struct vkd3d_shader_code source; + /** Format of the input code passed in \ref source. */ enum vkd3d_shader_source_type source_type; + /** Desired output format. */ enum vkd3d_shader_target_type target_type; + /** + * Pointer to an array of compilation options. This field is ignored if + * \ref option_count is zero, but must be valid otherwise. + * + * If the same option is specified multiple times, only the last value is + * used. + * + * Options not relevant to or not supported by a particular shader compiler + * or scanner will be ignored. + */ const struct vkd3d_shader_compile_option *options; + /** Size, in elements, of \ref options. */ unsigned int option_count; + /** Minimum severity of messages returned from the shader function. */ enum vkd3d_shader_log_level log_level; + /** + * Name of the initial source file, which may be used in error messages or + * debug information. This parameter is optional and may be NULL. + */ const char *source_name; };

1 0

Zebediah Figura : include: Add documentation for enum vkd3d_shader_structure_type.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: vkd3d Branch: master Commit: 73f1adfd22c26ac03d6136fe8b381b574889bd10 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73f1adfd22c26ac03d6136f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Aug 31 20:34:27 2020 -0500 include: Add documentation for enum vkd3d_shader_structure_type. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1f2a9c2..da05f2c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -27,14 +27,31 @@ extern "C" { #endif /* __cplusplus */ +/** + * \file vkd3d_shader.h + * + * \since 1.2 + * + * This file contains definitions for the vkd3d-shader library. + * + * The vkd3d-shader library provides multiple utilities related to the + * compilation, transformation, and reflection of GPU shaders. + */ + +/** The type of a chained structure. */ enum vkd3d_shader_structure_type { - /* 1.2 */ + /** The structure is a vkd3d_shader_compile_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO, + /** The structure is a vkd3d_shader_interface_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO, + /** The structure is a vkd3d_shader_scan_descriptor_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_SCAN_DESCRIPTOR_INFO, + /** The structure is a vkd3d_shader_spirv_domain_shader_target_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_DOMAIN_SHADER_TARGET_INFO, + /** The structure is a vkd3d_shader_spirv_target_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO, + /** The structure is a vkd3d_shader_transform_feedback_info structure. */ VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE),

1 0

Zebediah Figura : include: Add basic documentation for vkd3d_types.h.
by Alexandre Julliard 02 Sep '20

02 Sep '20

Module: vkd3d Branch: master Commit: 83c67e76ff1b697e80c90559fed1b4e625961b48 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=83c67e76ff1b697e80c9055… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 1 10:32:29 2020 -0500 include: Add basic documentation for vkd3d_types.h. This is built on Doxygen. I'm not personally attached to Doxygen, but it was easy enough to set up and write for, and I've found its compiled HTML to be reasonably legible. Note that Doxygen does allow for specifying documentation in external files, if keeping the documentation out of the header is desired. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .gitignore | 2 + Doxyfile.in | 17 ++ Makefile.am | 6 + configure.ac | 5 + include/vkd3d_types.h | 18 +- m4/ax_prog_doxygen.m4 | 586 ++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 633 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=83c67e76ff1b697e80c…

1 0

Carlos Rivera : kernel32/tests: Change file name to avoid collision with other tests.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 00a0e2cd8c4df240371ddd22516e4e3544a142ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=00a0e2cd8c4df240371ddd22… Author: Carlos Rivera <carlos(a)superkaos.org> Date: Tue Sep 1 11:17:36 2020 +0200 kernel32/tests: Change file name to avoid collision with other tests. Entries in IniFileMapping are persisted in Windows until the next reboot, even if removed from the registry. This made the function test_registry_mapping to cause other tests that accessed the actual winetest.ini file to fail if the profile test was run more than once on Windows without rebooting. Signed-off-by: Carlos Rivera <carlos(a)superkaos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 182 +++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00a0e2cd8c4df240371d…

1 0

Biswapriyo Nath : include/d3d11.idl: Add names in D3D11_FILTER enum.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: a3500122400680a1f3969e8673af54fc3ac45e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3500122400680a1f3969e86… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 1 12:00:12 2020 +0530 include/d3d11.idl: Add names in D3D11_FILTER enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 1ea0a6a6c9..80a65c9ae1 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -875,7 +875,25 @@ typedef enum D3D11_FILTER D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91, D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94, D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95, - D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5 + D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5, + D3D11_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100, + D3D11_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101, + D3D11_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104, + D3D11_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105, + D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110, + D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111, + D3D11_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114, + D3D11_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115, + D3D11_FILTER_MINIMUM_ANISOTROPIC = 0x155, + D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180, + D3D11_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181, + D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184, + D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185, + D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190, + D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191, + D3D11_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194, + D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195, + D3D11_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5 } D3D11_FILTER; typedef enum D3D11_DSV_FLAG

1 0

Biswapriyo Nath : include/d3d11.idl: Add flags in D3D11_RESOURCE_MISC_FLAG enum.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 46caa0fb1baf4381cd3bbf1f6af0031af5d7b35f URL: https://source.winehq.org/git/wine.git/?a=commit;h=46caa0fb1baf4381cd3bbf1f… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 1 12:00:12 2020 +0530 include/d3d11.idl: Add flags in D3D11_RESOURCE_MISC_FLAG enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 507cfd012a..1ea0a6a6c9 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -987,7 +987,10 @@ typedef enum D3D11_RESOURCE_MISC_FLAG D3D11_RESOURCE_MISC_RESTRICTED_CONTENT = 0x00001000L, D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE = 0x00002000L, D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x00004000L, - D3D11_RESOURCE_MISC_GUARDED = 0x00008000L + D3D11_RESOURCE_MISC_GUARDED = 0x00008000L, + D3D11_RESOURCE_MISC_TILE_POOL = 0x00020000L, + D3D11_RESOURCE_MISC_TILED = 0x00040000L, + D3D11_RESOURCE_MISC_HW_PROTECTED = 0x00080000L } D3D11_RESOURCE_MISC_FLAG; typedef struct D3D11_QUERY_DESC

1 0

Biswapriyo Nath : include/d3d10.idl: Add flags in D3D10_CREATE_DEVICE_FLAG enum.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 472b5ffc9a051860a873e085d8f935a3d94a9979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=472b5ffc9a051860a873e085… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 1 12:00:12 2020 +0530 include/d3d10.idl: Add flags in D3D10_CREATE_DEVICE_FLAG enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d10.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 4a94034a7c..146332ac1c 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -984,7 +984,9 @@ typedef enum D3D10_CREATE_DEVICE_FLAG { D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8, D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP = 0x10, D3D10_CREATE_DEVICE_BGRA_SUPPORT = 0x20, - D3D10_CREATE_DEVICE_STRICT_VALIDATION = 0x0200 + D3D10_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY = 0x80, + D3D10_CREATE_DEVICE_STRICT_VALIDATION = 0x200, + D3D10_CREATE_DEVICE_DEBUGGABLE = 0x400, } D3D10_CREATE_DEVICE_FLAG; /* Core */

1 0

Nikolay Sivov : combase: Move ORPC functionality.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 5c15a6c1ec5b0ea250cc37c15d57d50248c5b26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c15a6c1ec5b0ea250cc37c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:33 2020 +0100 combase: Move ORPC functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 13 +- dlls/combase/combase.c | 11 + dlls/combase/combase.spec | 10 +- dlls/combase/combase_private.h | 31 +- dlls/combase/marshal.c | 24 +- dlls/combase/rpc.c | 1615 +++++++++++++++++++++++++++++++++++++++ dlls/combase/stubmanager.c | 22 +- dlls/ole32/Makefile.in | 1 - dlls/ole32/compobj.c | 21 - dlls/ole32/compobj_private.h | 146 +--- dlls/ole32/ole32.spec | 10 +- dlls/ole32/rpc.c | 1654 ---------------------------------------- 12 files changed, 1676 insertions(+), 1882 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c15a6c1ec5b0ea250cc…

1 0

Nikolay Sivov : combase: Move remaining marshalling code.
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 11057c1370ca90e7405a051f63f9fbc35f836d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11057c1370ca90e7405a051f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:32 2020 +0100 combase: Move remaining marshalling code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 8 +- dlls/combase/combase.spec | 15 +- dlls/combase/combase_private.h | 22 +- dlls/combase/marshal.c | 1493 +++++++++++++++++++++++++++++++++++- dlls/combase/stubmanager.c | 18 +- dlls/ole32/compobj_private.h | 23 +- dlls/ole32/marshal.c | 1661 +--------------------------------------- dlls/ole32/ole32.spec | 9 +- dlls/ole32/rpc.c | 8 +- 9 files changed, 1533 insertions(+), 1724 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11057c1370ca90e7405a…

1 0

Nikolay Sivov : combase: Move CoUnmarshalInterface().
by Alexandre Julliard 01 Sep '20

01 Sep '20

Module: wine Branch: master Commit: 59a724d0cd4b46c412a901f1a156bfc7e4b11182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59a724d0cd4b46c412a901f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 1 15:16:31 2020 +0100 combase: Move CoUnmarshalInterface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 5 ++ dlls/combase/combase.spec | 2 +- dlls/combase/combase_private.h | 3 + dlls/combase/marshal.c | 146 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 143 +--------------------------------------- dlls/ole32/ole32.spec | 3 +- 6 files changed, 159 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59a724d0cd4b46c412a9…

1 0

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-commits September 2020