wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Piotr Caban : msvcrt: Copy memcmp implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 773f0a835bf26b97416763720c8a0f1b2ded8094 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773f0a835bf26b9741676372… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:22 2020 +0200 msvcrt: Copy memcmp implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 3a71dc97b0..fe2cf6abe5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2219,7 +2219,14 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 */ int __cdecl MSVCRT_memcmp(const void *ptr1, const void *ptr2, MSVCRT_size_t n) { - return memcmp(ptr1, ptr2, n); + const unsigned char *p1, *p2; + + for (p1 = ptr1, p2 = ptr2; n; n--, p1++, p2++) + { + if (*p1 < *p2) return -1; + if (*p1 > *p2) return 1; + } + return 0; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy memchr implementation from ntdll.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 9d4eeaeb7773d00d51ff60de29e4be8f43209d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4eeaeb7773d00d51ff60de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 11:10:19 2020 +0200 msvcrt: Copy memchr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a654bb1dde..3a71dc97b0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2267,7 +2267,10 @@ char* __cdecl MSVCRT_strrchr(const char *str, int c) */ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) { - return memchr(ptr, c, n); + const unsigned char *p = ptr; + + for (p = ptr; n; n--, p++) if (*p == c) return (void *)(ULONG_PTR)p; + return NULL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use div and ldiv function.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 75cdc3b6058cd42a4d96331b045b22fa0a7f88f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75cdc3b6058cd42a4d96331b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 22 12:30:16 2020 +0200 msvcrt: Don't use div and ldiv function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ae4a267e03..772065d44f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2059,8 +2059,14 @@ int CDECL MSVCRT__gcvt_s(char *buff, MSVCRT_size_t size, double number, int digi #ifdef __i386__ unsigned __int64 CDECL MSVCRT_div(int num, int denom) { - div_t dt = div(num,denom); - return ((unsigned __int64)dt.rem << 32) | (unsigned int)dt.quot; + union { + MSVCRT_div_t div; + unsigned __int64 uint64; + } ret; + + ret.div.quot = num / denom; + ret.div.rem = num % denom; + return ret.uint64; } #else /********************************************************************* @@ -2070,13 +2076,11 @@ unsigned __int64 CDECL MSVCRT_div(int num, int denom) */ MSVCRT_div_t CDECL MSVCRT_div(int num, int denom) { - div_t dt = div(num,denom); - MSVCRT_div_t ret; - ret.quot = dt.quot; - ret.rem = dt.rem; - - return ret; + MSVCRT_div_t ret; + ret.quot = num / denom; + ret.rem = num % denom; + return ret; } #endif /* ifdef __i386__ */ @@ -2089,8 +2093,14 @@ MSVCRT_div_t CDECL MSVCRT_div(int num, int denom) #ifdef __i386__ unsigned __int64 CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) { - ldiv_t ldt = ldiv(num,denom); - return ((unsigned __int64)ldt.rem << 32) | (MSVCRT_ulong)ldt.quot; + union { + MSVCRT_ldiv_t ldiv; + unsigned __int64 uint64; + } ret; + + ret.ldiv.quot = num / denom; + ret.ldiv.rem = num % denom; + return ret.uint64; } #else /********************************************************************* @@ -2100,13 +2110,11 @@ unsigned __int64 CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) */ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) { - ldiv_t result = ldiv(num,denom); - - MSVCRT_ldiv_t ret; - ret.quot = result.quot; - ret.rem = result.rem; + MSVCRT_ldiv_t ret; - return ret; + ret.quot = num / denom; + ret.rem = num % denom; + return ret; } #endif /* ifdef __i386__ */

1 0

Zebediah Figura : qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause().
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 5e407cec530e2d79f04a755e7f818c2ef84d725e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e407cec530e2d79f04a755e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 21 17:49:58 2020 -0500 qcap/vfwcapture: Return VFW_S_CANT_CUE from GetState(), not Pause(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 7d82a01109..910be107b0 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -124,7 +124,7 @@ static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) VfwCapture *filter = impl_from_strmbase_filter(iface); filter->device->ops->init_stream(filter->device); - return VFW_S_CANT_CUE; + return S_OK; } static HRESULT vfw_capture_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) @@ -140,7 +140,7 @@ static HRESULT vfw_capture_stop_stream(struct strmbase_filter *iface) VfwCapture *filter = impl_from_strmbase_filter(iface); filter->device->ops->stop_stream(filter->device); - return VFW_S_CANT_CUE; + return S_OK; } static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) @@ -151,6 +151,11 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) return S_OK; } +static HRESULT vfw_capture_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + return iface->state == State_Paused ? VFW_S_CANT_CUE : S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = vfw_capture_get_pin, @@ -160,6 +165,7 @@ static const struct strmbase_filter_ops filter_ops = .filter_start_stream = vfw_capture_start_stream, .filter_stop_stream = vfw_capture_stop_stream, .filter_cleanup_stream = vfw_capture_cleanup_stream, + .filter_wait_state = vfw_capture_wait_state, }; static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, REFIID iid, void **out)

1 0

Zebediah Figura : quartz/vmr9: Return E_INVALIDARG if both texture and offscreen flags are passed to AllocateSurfaceHelper().
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: wine Branch: master Commit: 7f0347bb04a2be2fcd5ebab826439c6f0d6a5703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0347bb04a2be2fcd5ebab8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 21 17:49:57 2020 -0500 quartz/vmr9: Return E_INVALIDARG if both texture and offscreen flags are passed to AllocateSurfaceHelper(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 7 +++++++ dlls/quartz/vmr9.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a2fd5b7686..092ee87132 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2760,6 +2760,13 @@ static void test_allocate_surface_helper(void) IDirect3DSurface9_Release(surfaces[0]); + info.Format = D3DFMT_A8R8G8B8; + info.dwFlags = VMR9AllocFlag_OffscreenSurface | VMR9AllocFlag_TextureSurface; + count = 1; + hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + out: IVMRSurfaceAllocatorNotify9_Release(notify); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 00cd6bbce8..f66500086d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2042,6 +2042,13 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa allocinfo->dwFlags, allocinfo->dwWidth, allocinfo->dwHeight, allocinfo->Format, allocinfo->Format, allocinfo->Pool, allocinfo->MinBuffers); + if ((allocinfo->dwFlags & VMR9AllocFlag_TextureSurface) + && (allocinfo->dwFlags & VMR9AllocFlag_OffscreenSurface)) + { + WARN("Invalid flags specified; returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (!allocinfo->Format) { IDirect3DSurface9 *backbuffer;

1 0

Henri Verbeet : vkd3d-shader: Output point sizes.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: e7828d67826d2e70c371f977451cd4f908836ac7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e7828d67826d2e70c371f97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:15 2020 +0430 vkd3d-shader: Output point sizes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bbfe701..3ece044 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5615,6 +5615,19 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_primitive(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_point_size(struct vkd3d_dxbc_compiler *compiler) +{ + static const struct vkd3d_spirv_builtin point_size = {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInPointSize}; + + /* Set the point size. Point sprites are not supported in d3d10+, but + * point primitives can still be used with e.g. stream output. Vulkan + * requires the point size to always be explicitly defined when outputting + * points. */ + vkd3d_spirv_build_op_store(&compiler->spirv_builder, + vkd3d_dxbc_compiler_emit_builtin_variable(compiler, &point_size, SpvStorageClassOutput, 0), + vkd3d_dxbc_compiler_get_constant_float(compiler, 1.0f), SpvMemoryAccessMaskNone); +} + static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5625,6 +5638,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_output_topology(struct vkd3d_dxbc_compi { case VKD3D_PT_POINTLIST: mode = SpvExecutionModeOutputPoints; + vkd3d_dxbc_compiler_emit_point_size(compiler); break; case VKD3D_PT_LINESTRIP: mode = SpvExecutionModeOutputLineStrip; @@ -8406,6 +8420,10 @@ static void vkd3d_dxbc_compiler_emit_cut_stream(struct vkd3d_dxbc_compiler *comp static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *compiler) { vkd3d_dxbc_compiler_emit_push_constant_buffers(compiler); + + if (compiler->xfb_info && compiler->xfb_info->element_count + && compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + vkd3d_dxbc_compiler_emit_point_size(compiler); } static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx)

1 0

Henri Verbeet : vkd3d-shader: Add missing VKD3D_FORCE_32_BIT_ENUM enum elements.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: 4906bd40c6f202f6a73eb5256f2e3a6c7ebc71f9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4906bd40c6f202f6a73eb52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:14 2020 +0430 vkd3d-shader: Add missing VKD3D_FORCE_32_BIT_ENUM enum elements. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2b1770f..f4a2be5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -103,18 +103,24 @@ enum vkd3d_shader_parameter_type VKD3D_SHADER_PARAMETER_TYPE_UNKNOWN, VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT, VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; enum vkd3d_shader_parameter_data_type { VKD3D_SHADER_PARAMETER_DATA_TYPE_UNKNOWN, VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_DATA_TYPE), }; enum vkd3d_shader_parameter_name { VKD3D_SHADER_PARAMETER_NAME_UNKNOWN, VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_NAME), }; struct vkd3d_shader_parameter_immediate_constant @@ -684,6 +690,8 @@ enum vkd3d_shader_minimum_precision VKD3D_SHADER_MINIMUM_PRECISION_FLOAT_8_2 = 2, VKD3D_SHADER_MINIMUM_PRECISION_INT_16 = 4, VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 = 5, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_MINIMUM_PRECISION), }; struct vkd3d_shader_signature_element

1 0

Henri Verbeet : vkd3d-shader: Rename the VKD3D_DUMMY_SAMPLER_INDEX macro to VKD3D_SHADER_DUMMY_SAMPLER_INDEX.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: a196555513e82945d52ca45ed62e5ff8474f95ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a196555513e82945d52ca45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:13 2020 +0430 vkd3d-shader: Rename the VKD3D_DUMMY_SAMPLER_INDEX macro to VKD3D_SHADER_DUMMY_SAMPLER_INDEX. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 2 +- libs/vkd3d-shader/spirv.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 601f21f..2b1770f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -153,7 +153,7 @@ struct vkd3d_shader_resource_binding struct vkd3d_shader_descriptor_binding binding; }; -#define VKD3D_DUMMY_SAMPLER_INDEX ~0u +#define VKD3D_SHADER_DUMMY_SAMPLER_INDEX ~0u struct vkd3d_shader_combined_resource_sampler { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 94d7eff..bbfe701 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5250,7 +5250,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ d = vkd3d_dxbc_compiler_get_descriptor_info(compiler, VKD3D_SHADER_DESCRIPTOR_TYPE_SAMPLER, 0, current->sampler_index); - depth = current->sampler_index != VKD3D_DUMMY_SAMPLER_INDEX + depth = current->sampler_index != VKD3D_SHADER_DUMMY_SAMPLER_INDEX && (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_SAMPLER_COMPARISON_MODE); image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource, resource_space, @@ -5263,7 +5263,7 @@ 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_DUMMY_SAMPLER_INDEX) + if (current->sampler_index == VKD3D_SHADER_DUMMY_SAMPLER_INDEX) vkd3d_spirv_build_op_name(builder, var_id, "t%u_dummy_sampler", resource_index); else vkd3d_spirv_build_op_name(builder, var_id, "t%u_s%u", resource_index, current->sampler_index); @@ -7210,7 +7210,7 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(stru return NULL; resource_index = resource_reg->idx[0].offset; - sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_DUMMY_SAMPLER_INDEX; + sampler_index = sampler_reg ? sampler_reg->idx[0].offset : VKD3D_SHADER_DUMMY_SAMPLER_INDEX; vkd3d_symbol_make_combined_sampler(&key, resource_index, sampler_index); if ((entry = rb_get(&compiler->symbol_table, &key)))

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_versioned_root_signature_desc structure.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: 23416913f43c33ffef582af2f2b80886ff31d3a1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=23416913f43c33ffef582af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:12 2020 +0430 vkd3d-shader: Rename the vkd3d_versioned_root_signature_desc structure. To vkd3d_shader_versioned_root_signature_desc. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 22 +++++++++--------- libs/vkd3d-shader/dxbc.c | 44 ++++++++++++++++++----------------- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_main.c | 16 ++++++------- libs/vkd3d/vkd3d_private.h | 2 +- tests/vkd3d_shader_api.c | 4 ++-- 7 files changed, 47 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=23416913f43c33ffef5…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_signature_desc1 structure to vkd3d_shader_root_signature_desc1.
by Alexandre Julliard 22 Jul '20

22 Jul '20

Module: vkd3d Branch: master Commit: 823e356460d4e5dda5e73bf6fa6fb2000b3e7bdd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=823e356460d4e5dda5e73bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 16:12:11 2020 +0430 vkd3d-shader: Rename the vkd3d_root_signature_desc1 structure to vkd3d_shader_root_signature_desc1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a5a3498..3bd9ce5 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -559,7 +559,7 @@ struct vkd3d_shader_root_parameter1 enum vkd3d_shader_visibility shader_visibility; }; -struct vkd3d_root_signature_desc1 +struct vkd3d_shader_root_signature_desc1 { unsigned int parameter_count; const struct vkd3d_shader_root_parameter1 *parameters; @@ -582,7 +582,7 @@ struct vkd3d_versioned_root_signature_desc union { struct vkd3d_shader_root_signature_desc v_1_0; - struct vkd3d_root_signature_desc1 v_1_1; + struct vkd3d_shader_root_signature_desc1 v_1_1; } u; }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1be733a..dd57287 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2606,7 +2606,7 @@ static int shader_parse_root_signature(const char *data, unsigned int data_size, } else { - struct vkd3d_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; + struct vkd3d_shader_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; assert(version == VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1); @@ -3262,7 +3262,7 @@ fail: static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_desc *dst, const struct vkd3d_versioned_root_signature_desc *src) { - const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; + const struct vkd3d_shader_root_signature_desc1 *src_desc = &src->u.v_1_1; struct vkd3d_shader_root_signature_desc *dst_desc = &dst->u.v_1_0; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter *parameters = NULL; @@ -3384,7 +3384,7 @@ static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_ const struct vkd3d_versioned_root_signature_desc *src) { const struct vkd3d_shader_root_signature_desc *src_desc = &src->u.v_1_0; - struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; + struct vkd3d_shader_root_signature_desc1 *dst_desc = &dst->u.v_1_1; struct vkd3d_shader_static_sampler_desc *samplers = NULL; struct vkd3d_shader_root_parameter1 *parameters = NULL; int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 80dbda1..b40d2b4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -495,7 +495,7 @@ static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_shader_root_sign memset(root_signature, 0, sizeof(*root_signature)); } -static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_desc1 *root_signature) +static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_shader_root_signature_desc1 *root_signature) { unsigned int i;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
83
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-commits July 2020