February 2018 - Wine-commits

Francois Gouget : testbot: Simplify computing the min and max activity values.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: tools Branch: master Commit: ab64e577473ba0546d10341fee81cd20c77b4329 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab64e577473ba0546d10341… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 6 02:57:08 2018 +0100 testbot: Simplify computing the min and max activity values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 2c21d9f..a2bd1b0 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -38,6 +38,17 @@ require Exporter; @EXPORT = qw(&GetActivity &GetStatistics); +sub _UpdateMin($$) +{ + $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); +} + +sub _UpdateMax($$) +{ + $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); +} + + =pod =over 12 @@ -110,7 +121,7 @@ sub GetActivity($;$) start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; - $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); + _UpdateMin($MinId, $RecordGroup->Id); } if (!defined $MinId) { @@ -375,14 +386,8 @@ sub GetStatistics($) _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) - { - $GlobalStats->{start} = $Job->Submitted; - } - if (!exists $GlobalStats->{end} or $GlobalStats->{end} < $Job->Ended) - { - $GlobalStats->{end} = $Job->Ended; - } + _UpdateMin($GlobalStats->{start}, $Job->Submitted); + _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -401,14 +406,8 @@ sub GetStatistics($) $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) { - if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) - { - $VMsStats->{start} = $Group->{start}; - } - if (!$VMsStats->{end} or $VMsStats->{end} < $Group->{end}) - { - $VMsStats->{end} = $Group->{end}; - } + _UpdateMin($VMsStats->{start}, $Group->{start}); + _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy);

1 0

Francois Gouget : testbot/web: Add the job' s remarks as a tooltip on the activity page.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: tools Branch: master Commit: ad65021749ba75744e5b3decb63010efe1b2e072 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ad65021749ba75744e5b3de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 6 03:12:10 2018 +0100 testbot/web: Add the job's remarks as a tooltip on the activity page. This allows getting a quick sense of what the task is about without having to change page or bloating the content of the table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 6ca3199..13c77c6 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -228,7 +228,9 @@ EOF $Label .= "/64" if ($Bitness); } } - $Label = "<a href='/JobDetails.pl?Key=". $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No) ."'>$Label</a>"; + my $Key = $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No); + my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); + $Label = "<a href='/JobDetails.pl?Key=$Key' title='$Title'>$Label</a>"; } elsif ($VMStatus->{status} eq "dirty") {

1 0

Józef Kucia : libs/vkd3d-shader: Translate dcl_tessellator_domain instructions.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: vkd3d Branch: master Commit: f1de58c58e0b09ab184cbfaaa3f1a1599faf3513 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1de58c58e0b09ab184cbfa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:00 2018 +0100 libs/vkd3d-shader: Translate dcl_tessellator_domain instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8a45676..85e2593 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3704,6 +3704,31 @@ static void vkd3d_dxbc_compiler_emit_dcl_gs_instances(struct vkd3d_dxbc_compiler SpvExecutionModeInvocations, instruction->declaration.count); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_domain domain = instruction->declaration.tessellator_domain; + SpvExecutionMode mode; + + switch (domain) + { + case VKD3D_TESSELLATOR_DOMAIN_LINE: + mode = SpvExecutionModeIsolines; + break; + case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: + mode = SpvExecutionModeTriangles; + break; + case VKD3D_TESSELLATOR_DOMAIN_QUAD: + mode = SpvExecutionModeQuads; + break; + default: + FIXME("Invalid tessellator domain %#x.\n", domain); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5644,6 +5669,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_GS_INSTANCES: vkd3d_dxbc_compiler_emit_dcl_gs_instances(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: + vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); + break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break;

1 0

Józef Kucia : libs/vkd3d-shader: Translate dcl_tessellator_partitioning instructions.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: vkd3d Branch: master Commit: 2759ea7857d50cc8cbcc0e9f117147c9d9739dc7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2759ea7857d50cc8cbcc0e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:01 2018 +0100 libs/vkd3d-shader: Translate dcl_tessellator_partitioning instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 85e2593..4673f85 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3729,6 +3729,32 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_partitioning partitioning = instruction->declaration.tessellator_partitioning; + SpvExecutionMode mode; + + switch (partitioning) + { + case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_TESSELLATOR_PARTITIONING_POW2: + mode = SpvExecutionModeSpacingEqual; + break; + case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + mode = SpvExecutionModeSpacingFractionalOdd; + break; + case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + mode = SpvExecutionModeSpacingFractionalEven; + break; + default: + FIXME("Invalid tessellator partitioning %#x.\n", partitioning); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5672,6 +5698,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: + vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(compiler, instruction); + break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break;

1 0

Józef Kucia : libs/vkd3d-shader: Implement vDomain.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: vkd3d Branch: master Commit: 26c5a1ef738eb7b9cf26ef21a9756399a3031db1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26c5a1ef738eb7b9cf26ef2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:02 2018 +0100 libs/vkd3d-shader: Implement vDomain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4673f85..817af6c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2816,6 +2816,8 @@ vkd3d_spirv_builtin_table[] = {VKD3D_SIV_NONE, VKD3DSPR_GSINSTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, {VKD3D_SIV_NONE, VKD3DSPR_OUTPOINTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, + {VKD3D_SIV_NONE, VKD3DSPR_TESSCOORD, VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}, + {VKD3D_SIV_NONE, VKD3DSPR_DEPTHOUT, VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}, {VKD3D_SIV_POSITION, ~0u, VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition},

1 0

Józef Kucia : include: Add typedefs for vkd3d function pointers.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: vkd3d Branch: master Commit: 23b33e7b2451cd7c414cbe17d85dfa0bf74c36b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=23b33e7b2451cd7c414cbe1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:03 2018 +0100 include: Add typedefs for vkd3d function pointers. It makes easier to load vkd3d dynamically. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 32e8123..99a6222 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -77,6 +77,8 @@ struct vkd3d_device_create_info #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 #define VKD3D_RESOURCE_SWAPCHAIN_IMAGE 0x00000002 +#ifndef VKD3D_NO_PROTOTYPES + HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); @@ -99,7 +101,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_D ULONG vkd3d_resource_decref(ID3D12Resource *resource); ULONG vkd3d_resource_incref(ID3D12Resource *resource); -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, +HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, @@ -107,6 +109,41 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +#endif /* VKD3D_NO_PROTOTYPES */ + +/* + * Function pointer typedefs for vkd3d functions. + */ +typedef HRESULT (*vkd3d_create_instance_pfn)(const struct vkd3d_instance_create_info *create_info, + struct vkd3d_instance **instance); +typedef ULONG (*vkd3d_instance_decref_pfn)(struct vkd3d_instance *instance); +typedef VkInstance (*vkd3d_instance_get_vk_instance_pfn)(struct vkd3d_instance *instance); +typedef ULONG (*vkd3d_instance_incref_pfn)(struct vkd3d_instance *instance); + +typedef HRESULT (*vkd3d_create_device_pfn)(const struct vkd3d_device_create_info *create_info, + REFIID iid, void **device); +typedef IUnknown * (*vkd3d_get_device_parent_pfn)(ID3D12Device *device); +typedef VkDevice (*vkd3d_get_vk_device_pfn)(ID3D12Device *device); +typedef VkPhysicalDevice (*vkd3d_get_vk_physical_device_pfn)(ID3D12Device *device); +typedef struct vkd3d_instance * (*vkd3d_instance_from_device_pfn)(ID3D12Device *device); + +typedef uint32_t (*vkd3d_get_vk_queue_family_index_pfn)(ID3D12CommandQueue *queue); +typedef VkQueue (*vkd3d_acquire_vk_queue_pfn)(ID3D12CommandQueue *queue); +typedef void (*vkd3d_release_vk_queue_pfn)(ID3D12CommandQueue *queue); + +typedef HRESULT (*vkd3d_create_image_resource_pfn)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, + VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); +typedef ULONG (*vkd3d_resource_decref_pfn)(ID3D12Resource *resource); +typedef ULONG (*vkd3d_resource_incref_pfn)(ID3D12Resource *resource); + +typedef HRESULT (*vkd3d_serialize_root_signature_pfn)(const D3D12_ROOT_SIGNATURE_DESC *desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + +typedef HRESULT (*vkd3d_create_root_signature_deserializer_pfn)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); + +typedef VkFormat (*vkd3d_get_vk_format_pfn)(DXGI_FORMAT format); + #ifdef __cplusplus } #endif /* __cplusplus */

1 0

Józef Kucia : libs/vkd3d: Use PFN prefix for function pointer typedefs.
by Alexandre Julliard 06 Feb '18

06 Feb '18

Module: vkd3d Branch: master Commit: 65aab7b47b6ae7a2ce6056ff9957131c4fb25712 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65aab7b47b6ae7a2ce6056f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:04 2018 +0100 libs/vkd3d: Use PFN prefix for function pointer typedefs. A more common convention, e.g. Vulkan uses it. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 52 ++++++++++++++++++------------------- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- libs/vkd3d/device.c | 12 ++++----- libs/vkd3d/vkd3d_private.h | 12 ++++----- tests/vkd3d_api.c | 8 +++--- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 99a6222..6ec85db 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -34,24 +34,24 @@ extern "C" { #endif /* __cplusplus */ -typedef bool (*vkd3d_signal_event_pfn)(HANDLE event); +typedef bool (*PFN_vkd3d_signal_event)(HANDLE event); -typedef void * (*vkd3d_thread_pfn)(void *data); +typedef void * (*PFN_vkd3d_thread)(void *data); -typedef void * (*vkd3d_create_thread_pfn)(vkd3d_thread_pfn thread_main, void *data); -typedef bool (*vkd3d_join_thread_pfn)(void *thread); +typedef void * (*PFN_vkd3d_create_thread)(PFN_vkd3d_thread thread_main, void *data); +typedef bool (*PFN_vkd3d_join_thread)(void *thread); struct vkd3d_instance; struct vkd3d_instance_create_info { - vkd3d_signal_event_pfn signal_event_pfn; - vkd3d_create_thread_pfn create_thread_pfn; - vkd3d_join_thread_pfn join_thread_pfn; + PFN_vkd3d_signal_event pfn_signal_event; + PFN_vkd3d_create_thread pfn_create_thread; + PFN_vkd3d_join_thread pfn_join_thread; size_t wchar_size; /* If set to NULL, libvkd3d loads libvulkan. */ - PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr_pfn; + PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr; const char * const *instance_extensions; uint32_t instance_extension_count; @@ -114,35 +114,35 @@ VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); /* * Function pointer typedefs for vkd3d functions. */ -typedef HRESULT (*vkd3d_create_instance_pfn)(const struct vkd3d_instance_create_info *create_info, +typedef HRESULT (*PFN_vkd3d_create_instance)(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); -typedef ULONG (*vkd3d_instance_decref_pfn)(struct vkd3d_instance *instance); -typedef VkInstance (*vkd3d_instance_get_vk_instance_pfn)(struct vkd3d_instance *instance); -typedef ULONG (*vkd3d_instance_incref_pfn)(struct vkd3d_instance *instance); +typedef ULONG (*PFN_vkd3d_instance_decref)(struct vkd3d_instance *instance); +typedef VkInstance (*PFN_vkd3d_instance_get_vk_instance)(struct vkd3d_instance *instance); +typedef ULONG (*PFN_vkd3d_instance_incref)(struct vkd3d_instance *instance); -typedef HRESULT (*vkd3d_create_device_pfn)(const struct vkd3d_device_create_info *create_info, +typedef HRESULT (*PFN_vkd3d_create_device)(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device); -typedef IUnknown * (*vkd3d_get_device_parent_pfn)(ID3D12Device *device); -typedef VkDevice (*vkd3d_get_vk_device_pfn)(ID3D12Device *device); -typedef VkPhysicalDevice (*vkd3d_get_vk_physical_device_pfn)(ID3D12Device *device); -typedef struct vkd3d_instance * (*vkd3d_instance_from_device_pfn)(ID3D12Device *device); +typedef IUnknown * (*PFN_vkd3d_get_device_parent)(ID3D12Device *device); +typedef VkDevice (*PFN_vkd3d_get_vk_device)(ID3D12Device *device); +typedef VkPhysicalDevice (*PFN_vkd3d_get_vk_physical_device)(ID3D12Device *device); +typedef struct vkd3d_instance * (*PFN_vkd3d_instance_from_device)(ID3D12Device *device); -typedef uint32_t (*vkd3d_get_vk_queue_family_index_pfn)(ID3D12CommandQueue *queue); -typedef VkQueue (*vkd3d_acquire_vk_queue_pfn)(ID3D12CommandQueue *queue); -typedef void (*vkd3d_release_vk_queue_pfn)(ID3D12CommandQueue *queue); +typedef uint32_t (*PFN_vkd3d_get_vk_queue_family_index)(ID3D12CommandQueue *queue); +typedef VkQueue (*PFN_vkd3d_acquire_vk_queue)(ID3D12CommandQueue *queue); +typedef void (*PFN_vkd3d_release_vk_queue)(ID3D12CommandQueue *queue); -typedef HRESULT (*vkd3d_create_image_resource_pfn)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, +typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); -typedef ULONG (*vkd3d_resource_decref_pfn)(ID3D12Resource *resource); -typedef ULONG (*vkd3d_resource_incref_pfn)(ID3D12Resource *resource); +typedef ULONG (*PFN_vkd3d_resource_decref)(ID3D12Resource *resource); +typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); -typedef HRESULT (*vkd3d_serialize_root_signature_pfn)(const D3D12_ROOT_SIGNATURE_DESC *desc, +typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); -typedef HRESULT (*vkd3d_create_root_signature_deserializer_pfn)(const void *data, SIZE_T data_size, +typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -typedef VkFormat (*vkd3d_get_vk_format_pfn)(DXGI_FORMAT format); +typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 4537de0..ba64d40 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -48,7 +48,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, FIXME("Ignoring adapter %p.\n", adapter); memset(&instance_create_info, 0, sizeof(instance_create_info)); - instance_create_info.signal_event_pfn = vkd3d_signal_event; + instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c59ba87..31fee8a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -246,12 +246,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; - if (!create_info->signal_event_pfn) + if (!create_info->pfn_signal_event) { ERR("Invalid signal event function pointer.\n"); return E_INVALIDARG; } - if (!create_info->create_thread_pfn != !create_info->join_thread_pfn) + if (!create_info->pfn_create_thread != !create_info->pfn_join_thread) { ERR("Invalid create/join thread function pointers.\n"); return E_INVALIDARG; @@ -262,12 +262,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return E_INVALIDARG; } - instance->signal_event = create_info->signal_event_pfn; - instance->create_thread = create_info->create_thread_pfn; - instance->join_thread = create_info->join_thread_pfn; + instance->signal_event = create_info->pfn_signal_event; + instance->create_thread = create_info->pfn_create_thread; + instance->join_thread = create_info->pfn_join_thread; instance->wchar_size = create_info->wchar_size; - if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->vkGetInstanceProcAddr_pfn))) + if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index acf7824..f222871 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -87,9 +87,9 @@ struct vkd3d_instance VkInstance vk_instance; struct vkd3d_vk_instance_procs vk_procs; - vkd3d_signal_event_pfn signal_event; - vkd3d_create_thread_pfn create_thread; - vkd3d_join_thread_pfn join_thread; + PFN_vkd3d_signal_event signal_event; + PFN_vkd3d_create_thread create_thread; + PFN_vkd3d_join_thread join_thread; size_t wchar_size; struct vkd3d_vulkan_info vk_info; @@ -640,7 +640,7 @@ struct d3d12_device VkDevice vk_device; VkPhysicalDevice vk_physical_device; struct vkd3d_vk_device_procs vk_procs; - vkd3d_signal_event_pfn signal_event; + PFN_vkd3d_signal_event signal_event; size_t wchar_size; struct vkd3d_gpu_va_allocator gpu_va_allocator; @@ -663,8 +663,8 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - vkd3d_create_thread_pfn create_thread; - vkd3d_join_thread_pfn join_thread; + PFN_vkd3d_create_thread create_thread; + PFN_vkd3d_join_thread join_thread; IUnknown *parent; LUID adapter_luid; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 7135737..abef867 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -46,7 +46,7 @@ static bool signal_event(HANDLE event) static const struct vkd3d_instance_create_info instance_default_create_info = { .wchar_size = sizeof(WCHAR), - .signal_event_pfn = signal_event, + .pfn_signal_event = signal_event, }; static const struct vkd3d_device_create_info device_default_create_info = @@ -134,12 +134,12 @@ static void test_create_instance(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); create_info = instance_default_create_info; - create_info.signal_event_pfn = NULL; + create_info.pfn_signal_event = NULL; hr = vkd3d_create_instance(&create_info, &instance); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); create_info = instance_default_create_info; - create_info.vkGetInstanceProcAddr_pfn = vkGetInstanceProcAddr; + create_info.pfn_vkGetInstanceProcAddr = vkGetInstanceProcAddr; hr = vkd3d_create_instance(&create_info, &instance); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); refcount = vkd3d_instance_decref(instance); @@ -405,7 +405,7 @@ static void test_required_device_extensions(void) HRESULT hr; instance_create_info = instance_default_create_info; - instance_create_info.vkGetInstanceProcAddr_pfn = fake_vkGetInstanceProcAddr; + instance_create_info.pfn_vkGetInstanceProcAddr = fake_vkGetInstanceProcAddr; hr = vkd3d_create_instance(&instance_create_info, &instance); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);

1 0

Alexandre Julliard : krnl386: Remove support for vm86 contexts.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 526b245237b9571beebac8a4653e7dd74c62c7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=526b245237b9571beebac8a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:13:07 2018 +0100 krnl386: Remove support for vm86 contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 6 ++-- dlls/krnl386.exe16/dosvm.c | 15 +++----- dlls/krnl386.exe16/fpu.c | 3 -- dlls/krnl386.exe16/instr.c | 7 ++-- dlls/krnl386.exe16/int15.c | 6 ---- dlls/krnl386.exe16/int21.c | 76 ++++++----------------------------------- dlls/krnl386.exe16/int2f.c | 72 ++++---------------------------------- dlls/krnl386.exe16/interrupts.c | 50 ++++++++++----------------- 8 files changed, 42 insertions(+), 193 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=526b245237b9571beeba…

1 0

Alexandre Julliard : winebuild: Stop building the DPMI event check routine.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 96c77a8cf65a8f9300cd45e08dfc3f74985dc62b URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c77a8cf65a8f9300cd45e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:16:13 2018 +0100 winebuild: Stop building the DPMI event check routine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/relay.c | 52 ------------------------------------------------- 1 file changed, 52 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4b78f68..1adbda0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -36,8 +36,6 @@ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */ -#define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ -#define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */ static void function_header( const char *name ) { @@ -749,53 +747,6 @@ static void BuildCallTo32CBClient( int isEx ) /******************************************************************* - * BuildPendingEventCheck - * - * Build a function that checks whether there are any - * pending DPMI events. - * - * Stack layout: - * - * (sp+12) long eflags - * (sp+6) long cs - * (sp+2) long ip - * (sp) word fs - * - * On entry to function, fs register points to a valid TEB. - * On exit from function, stack will be popped. - */ -static void BuildPendingEventCheck(void) -{ - /* Function header */ - - function_header( "DPMI_PendingEventCheck" ); - - /* Check for pending events. */ - - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", VM86_PENDING_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", DPMI_VIF_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - - /* Process pending events. */ - - output( "\tsti\n" ); - - /* Start cleanup. Restore fs register. */ - - output( "%s\n", asm_globl("DPMI_PendingEventCheck_Cleanup") ); - output( "\tpopw %%fs\n" ); - - /* Return from function. */ - - output( "%s\n", asm_globl("DPMI_PendingEventCheck_Return") ); - output( "\tiret\n" ); - - output_function_size( "DPMI_PendingEventCheck" ); -} - - -/******************************************************************* * output_asm_relays16 * * Build all the 16-bit relay callbacks @@ -833,9 +784,6 @@ void output_asm_relays16(void) /* CBClientThunkSLEx routine */ BuildCallTo32CBClient( 1 ); - /* Pending DPMI events check stub */ - BuildPendingEventCheck(); - output( "%s\n", asm_globl("__wine_call16_end") ); output_function_size( "__wine_spec_thunk_text_16" );

1 0

Alexandre Julliard : ntdll: Get rid of the vm86 structure in the TEB.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 73d1b89a128de9aebc0256f77b1816102daf61fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d1b89a128de9aebc0256f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:16:44 2018 +0100 ntdll: Get rid of the vm86 structure in the TEB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 6 ------ include/winternl.h | 12 ------------ 2 files changed, 18 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a980dc7..8a64338 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -226,9 +226,6 @@ struct debug_info /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ struct ntdll_thread_data { -#ifdef __i386__ - WINE_VM86_TEB_INFO __vm86; /* FIXME: placeholder for vm86 data from struct x86_thread_data */ -#endif struct debug_info *debug_info; /* info for debugstr functions */ void *start_stack; /* stack for thread startup */ int request_fd; /* fd for sending server requests */ @@ -239,9 +236,6 @@ struct ntdll_thread_data }; C_ASSERT( sizeof(struct ntdll_thread_data) <= sizeof(((TEB *)0)->GdiTebBatch) ); -#ifdef __i386__ -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct ntdll_thread_data, __vm86 ) == 0x1fc ); -#endif static inline struct ntdll_thread_data *ntdll_get_thread_data(void) { diff --git a/include/winternl.h b/include/winternl.h index 4c02873..2911ff6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2913,18 +2913,6 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) #ifdef __WINESRC__ -/* FIXME: private structure for vm86 mode, stored in teb->GdiTebBatch */ -typedef struct -{ - DWORD dpmi_vif; - DWORD vm86_pending; -} WINE_VM86_TEB_INFO; - -static inline WINE_VM86_TEB_INFO *get_vm86_teb_info(void) -{ - return (WINE_VM86_TEB_INFO *)&NtCurrentTeb()->GdiTebBatch; -} - /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */ typedef struct

1 0