- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Move the wined3d_vk.h include to individual files.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 166186ba4636b44e73f0bc2a5f059481d5c6f8a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/166186ba4636b44e73f0bc2a5f0594… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:46:40 2022 -0600 wined3d: Move the wined3d_vk.h include to individual files. --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 1 + dlls/wined3d/context_vk.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/query.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/sampler.c | 1 + dlls/wined3d/shader_spirv.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_main.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- dlls/wined3d/wined3d_vk.h | 1 + 15 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5b6042659aa..3dcf2230643 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -17,6 +17,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fa24f006872..a3881438976 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -23,6 +23,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 097f8c7032c..efc18e2ff69 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -23,6 +23,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6c9d7f4368c..deb6d3dc210 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -25,6 +25,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index be739704922..8e5f60cc7fc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -19,6 +19,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 471d2f32f03..6d4dbb75ef6 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -22,6 +22,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index d6e19fc521c..e6c226af1af 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -18,6 +18,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index ad0a8f1b3e8..966721905a4 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -18,6 +18,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index cad27d7e7ea..ac6f9ea6222 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -21,6 +21,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 32923349c6b..78b1f52221c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -21,6 +21,7 @@ */ #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e34be2996b1..3618490b1c7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -27,6 +27,7 @@ #include <stdio.h> #include "wined3d_private.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a95ff13410f..d318318d2b3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -19,6 +19,7 @@ #include "wined3d_private.h" #include "wined3d_shaders.h" +#include "wined3d_vk.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 15c8e237af3..0ff215f7312 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -27,6 +27,8 @@ #include "initguid.h" #include "wined3d_private.h" #include "d3d12.h" +#define VK_NO_PROTOTYPES +#include "wine/vulkan.h" #include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3034b947c00..6e2bdc8aaf1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6048,6 +6048,4 @@ static inline bool wined3d_map_persistent(void) extern CRITICAL_SECTION wined3d_command_cs; -#include "wined3d_vk.h" - #endif diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index c44e8aa45b0..170d0cc3a79 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -24,6 +24,7 @@ #include "wine/wined3d.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" +#include "wined3d_private.h" struct wined3d_buffer_vk; struct wined3d_context_vk;

1 0

Biswapriyo Nath : include: Add ID2D1SvgGlyphStyle in d2d1_3.idl.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: de1d097d290518e008c2ef01f104dcf9d12b0498 URL: https://gitlab.winehq.org/wine/wine/-/commit/de1d097d290518e008c2ef01f104dc… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 14 21:12:20 2023 +0530 include: Add ID2D1SvgGlyphStyle in d2d1_3.idl. --- include/d2d1_3.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index c88226b4136..830c196a484 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -309,6 +309,36 @@ interface ID2D1SpriteBatch : ID2D1Resource void Clear(void); } +[ + object, + uuid(af671749-d241-4db8-8e41-dcc2e5c1a438), + local, +] +interface ID2D1SvgGlyphStyle : ID2D1Resource +{ + HRESULT SetFill( + [in, optional] ID2D1Brush *brush + ); + void GetFill( + [out] ID2D1Brush **brush + ); + HRESULT SetStroke( + [in, optional] ID2D1Brush *brush, + [in] FLOAT stroke_width, + [in, optional] const FLOAT *dashes, + [in, optional] UINT32 dashes_count, + [in] FLOAT dash_offset + ); + UINT32 GetStrokeDashesCount(void); + void GetStroke( + [out, optional] ID2D1Brush **brush, + [out, optional] FLOAT *stroke_width, + [out, optional] FLOAT *dashes, + [in, optional] UINT32 dashes_count, + [out, optional] FLOAT *dash_offset + ); +} + [ object, uuid(394ea6a3-0c34-4321-950b-6ca20f0be6c7),

1 0

Zebediah Figura : wined3d: Move remaining wined3d_context_vk functions to wined3d_vk.h.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: e4e7c9b23fb8b74bf0bb04b55e51fa196435800e URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e7c9b23fb8b74bf0bb04b55e51fa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:33:57 2022 -0600 wined3d: Move remaining wined3d_context_vk functions to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 65 ++---------------------------------------- dlls/wined3d/wined3d_vk.h | 61 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3c3e2eef0f..fd7d766a1a4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -113,7 +113,6 @@ static inline const char *wined3d_get_line(const char **ptr, const char *end) struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; -struct wined3d_context_vk; struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; @@ -5829,68 +5828,6 @@ static inline void wined3d_context_destroy_bo(struct wined3d_context *context, s context->device->adapter->adapter_ops->adapter_destroy_bo(context, bo); } -#include "wined3d_vk.h" - -static inline void wined3d_context_vk_reference_bo(const struct wined3d_context_vk *context_vk, - struct wined3d_bo_vk *bo) -{ - bo->command_buffer_id = context_vk->current_command_buffer.id; -} - -static inline void wined3d_context_vk_reference_image(const struct wined3d_context_vk *context_vk, - struct wined3d_image_vk *image) -{ - image->command_buffer_id = context_vk->current_command_buffer.id; -} - -static inline void wined3d_context_vk_reference_texture(const struct wined3d_context_vk *context_vk, - struct wined3d_texture_vk *texture_vk) -{ - wined3d_context_vk_reference_image(context_vk, &texture_vk->image); -} - -static inline void wined3d_context_vk_reference_resource(const struct wined3d_context_vk *context_vk, - struct wined3d_resource *resource) -{ - if (resource->type == WINED3D_RTYPE_BUFFER) - wined3d_context_vk_reference_bo(context_vk, wined3d_bo_vk(buffer_from_resource(resource)->buffer_object)); - else - wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); -} - -static inline void wined3d_context_vk_reference_query(const struct wined3d_context_vk *context_vk, - struct wined3d_query_vk *query_vk) -{ - query_vk->command_buffer_id = context_vk->current_command_buffer.id; -} - -static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk, - struct wined3d_sampler_vk *sampler_vk) -{ - sampler_vk->command_buffer_id = context_vk->current_command_buffer.id; -} - -static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, - struct wined3d_rendertarget_view_vk *rtv_vk) -{ - wined3d_context_vk_reference_resource(context_vk, rtv_vk->v.resource); - rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; -} - -static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, - struct wined3d_shader_resource_view_vk *srv_vk) -{ - wined3d_context_vk_reference_resource(context_vk, srv_vk->v.resource); - srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; -} - -static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, - struct wined3d_unordered_access_view_vk *uav_vk) -{ - wined3d_context_vk_reference_resource(context_vk, uav_vk->v.resource); - uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; -} - static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { @@ -6077,6 +6014,8 @@ static inline bool isStateDirty(const struct wined3d_context *context, unsigned return wined3d_context_is_graphics_state_dirty(context, state_id); } +#include "wined3d_vk.h" + static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format) { VkImageAspectFlags mask = 0; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 9e24fbafd85..4ed77fcad53 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -26,6 +26,7 @@ #include "wine/vulkan.h" struct wined3d_buffer_vk; +struct wined3d_context_vk; struct wined3d_device_vk; #define VK_INSTANCE_FUNCS() \ @@ -1035,4 +1036,64 @@ static inline const struct wined3d_format_vk *wined3d_format_vk(const struct win return CONTAINING_RECORD(format, struct wined3d_format_vk, f); } +static inline void wined3d_context_vk_reference_bo(const struct wined3d_context_vk *context_vk, + struct wined3d_bo_vk *bo) +{ + bo->command_buffer_id = context_vk->current_command_buffer.id; +} + +static inline void wined3d_context_vk_reference_image(const struct wined3d_context_vk *context_vk, + struct wined3d_image_vk *image) +{ + image->command_buffer_id = context_vk->current_command_buffer.id; +} + +static inline void wined3d_context_vk_reference_texture(const struct wined3d_context_vk *context_vk, + struct wined3d_texture_vk *texture_vk) +{ + wined3d_context_vk_reference_image(context_vk, &texture_vk->image); +} + +static inline void wined3d_context_vk_reference_resource(const struct wined3d_context_vk *context_vk, + struct wined3d_resource *resource) +{ + if (resource->type == WINED3D_RTYPE_BUFFER) + wined3d_context_vk_reference_bo(context_vk, wined3d_bo_vk(buffer_from_resource(resource)->buffer_object)); + else + wined3d_context_vk_reference_texture(context_vk, wined3d_texture_vk(texture_from_resource(resource))); +} + +static inline void wined3d_context_vk_reference_query(const struct wined3d_context_vk *context_vk, + struct wined3d_query_vk *query_vk) +{ + query_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + +static inline void wined3d_context_vk_reference_sampler(const struct wined3d_context_vk *context_vk, + struct wined3d_sampler_vk *sampler_vk) +{ + sampler_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + +static inline void wined3d_context_vk_reference_rendertarget_view(const struct wined3d_context_vk *context_vk, + struct wined3d_rendertarget_view_vk *rtv_vk) +{ + wined3d_context_vk_reference_resource(context_vk, rtv_vk->v.resource); + rtv_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + +static inline void wined3d_context_vk_reference_shader_resource_view(const struct wined3d_context_vk *context_vk, + struct wined3d_shader_resource_view_vk *srv_vk) +{ + wined3d_context_vk_reference_resource(context_vk, srv_vk->v.resource); + srv_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + +static inline void wined3d_context_vk_reference_unordered_access_view(const struct wined3d_context_vk *context_vk, + struct wined3d_unordered_access_view_vk *uav_vk) +{ + wined3d_context_vk_reference_resource(context_vk, uav_vk->v.resource); + uav_vk->view_vk.command_buffer_id = context_vk->current_command_buffer.id; +} + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move vk_aspect_mask_from_format() functions to wined3d_vk.h.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 49e437a0c0540854e3900136eda9d579ad003cc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/49e437a0c0540854e3900136eda9d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:35:59 2022 -0600 wined3d: Move vk_aspect_mask_from_format() functions to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 18 ++---------------- dlls/wined3d/wined3d_vk.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd7d766a1a4..3034b947c00 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6014,22 +6014,6 @@ static inline bool isStateDirty(const struct wined3d_context *context, unsigned return wined3d_context_is_graphics_state_dirty(context, state_id); } -#include "wined3d_vk.h" - -static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format) -{ - VkImageAspectFlags mask = 0; - - if (format->depth_size) - mask |= VK_IMAGE_ASPECT_DEPTH_BIT; - if (format->stencil_size) - mask |= VK_IMAGE_ASPECT_STENCIL_BIT; - if (!mask || format->red_size || format->green_size || format->blue_size || format->alpha_size) - mask |= VK_IMAGE_ASPECT_COLOR_BIT; - - return mask; -} - static inline bool wined3d_primitive_type_is_list(enum wined3d_primitive_type t) { return t == WINED3D_PT_POINTLIST @@ -6064,4 +6048,6 @@ static inline bool wined3d_map_persistent(void) extern CRITICAL_SECTION wined3d_command_cs; +#include "wined3d_vk.h" + #endif diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 4ed77fcad53..c44e8aa45b0 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -256,6 +256,20 @@ void wined3d_format_colour_to_vk(const struct wined3d_format *format, const stru void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; +static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format) +{ + VkImageAspectFlags mask = 0; + + if (format->depth_size) + mask |= VK_IMAGE_ASPECT_DEPTH_BIT; + if (format->stencil_size) + mask |= VK_IMAGE_ASPECT_STENCIL_BIT; + if (!mask || format->red_size || format->green_size || format->blue_size || format->alpha_size) + mask |= VK_IMAGE_ASPECT_COLOR_BIT; + + return mask; +} + struct wined3d_bo_vk { struct wined3d_bo b;

1 0

Zebediah Figura : wined3d: Move struct wined3d_format_vk to wined3d_vk.h.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: e7de5a45a90dba3cf0551065f7839d8bafce8cfb URL: https://gitlab.winehq.org/wine/wine/-/commit/e7de5a45a90dba3cf0551065f7839d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:31:44 2022 -0600 wined3d: Move struct wined3d_format_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 18 ++---------------- dlls/wined3d/wined3d_vk.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00e1b31eac1..c3c3e2eef0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5515,8 +5515,6 @@ struct wined3d_format enum wined3d_format_id typeless_id; }; -#include "wined3d_vk.h" - const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int bind_flags) DECLSPEC_HIDDEN; enum wined3d_format_id wined3d_get_typed_format_id(const struct wined3d_adapter *adapter, @@ -5525,8 +5523,6 @@ void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigne unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; -void wined3d_format_colour_to_vk(const struct wined3d_format *format, const struct wined3d_color *c, - VkClearColorValue *retval) DECLSPEC_HIDDEN; void wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color, void *ret) DECLSPEC_HIDDEN; void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t *src, @@ -5563,18 +5559,6 @@ static inline const struct wined3d_format_gl *wined3d_format_gl(const struct win return CONTAINING_RECORD(format, struct wined3d_format_gl, f); } -struct wined3d_format_vk -{ - struct wined3d_format f; - - VkFormat vk_format; -}; - -static inline const struct wined3d_format_vk *wined3d_format_vk(const struct wined3d_format *format) -{ - return CONTAINING_RECORD(format, struct wined3d_format_vk, f); -} - BOOL wined3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) @@ -5845,6 +5829,8 @@ static inline void wined3d_context_destroy_bo(struct wined3d_context *context, s context->device->adapter->adapter_ops->adapter_destroy_bo(context, bo); } +#include "wined3d_vk.h" + static inline void wined3d_context_vk_reference_bo(const struct wined3d_context_vk *context_vk, struct wined3d_bo_vk *bo) { diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 0d5d120b271..9e24fbafd85 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -250,6 +250,8 @@ VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPE VkPipelineStageFlags vk_pipeline_stage_mask_from_buffer_usage(VkBufferUsageFlags usage) DECLSPEC_HIDDEN; VkBufferUsageFlags vk_buffer_usage_from_bind_flags(uint32_t bind_flags) DECLSPEC_HIDDEN; VkMemoryPropertyFlags vk_memory_type_from_access_flags(uint32_t access, uint32_t usage) DECLSPEC_HIDDEN; +void wined3d_format_colour_to_vk(const struct wined3d_format *format, const struct wined3d_color *c, + VkClearColorValue *retval) DECLSPEC_HIDDEN; void wined3d_vk_swizzle_from_color_fixup(VkComponentMapping *mapping, struct color_fixup_desc fixup) DECLSPEC_HIDDEN; const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; @@ -1021,4 +1023,16 @@ HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +struct wined3d_format_vk +{ + struct wined3d_format f; + + VkFormat vk_format; +}; + +static inline const struct wined3d_format_vk *wined3d_format_vk(const struct wined3d_format *format) +{ + return CONTAINING_RECORD(format, struct wined3d_format_vk, f); +} + #endif /* __WINE_WINED3D_VK */

1 0

Zebediah Figura : wined3d: Move struct wined3d_swapchain_vk to wined3d_vk.h.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 85869cb78cde67f5150d92f796f8922655b2addd URL: https://gitlab.winehq.org/wine/wine/-/commit/85869cb78cde67f5150d92f796f892… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:30:14 2022 -0600 wined3d: Move struct wined3d_swapchain_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 32 ++------------------------------ dlls/wined3d/wined3d_vk.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9c52f1c7eaf..00e1b31eac1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4995,36 +4995,6 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - -struct wined3d_swapchain_vk -{ - struct wined3d_swapchain s; - - VkSwapchainKHR vk_swapchain; - VkSurfaceKHR vk_surface; - VkImage *vk_images; - struct - { - VkSemaphore available; - VkSemaphore presentable; - uint64_t command_buffer_id; - } *vk_semaphores; - unsigned int current, image_count; - unsigned int width, height; -}; - -static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_swapchain *swapchain) -{ - return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_vk, s); -} - -void wined3d_swapchain_vk_cleanup(struct wined3d_swapchain_vk *swapchain_vk) DECLSPEC_HIDDEN; -HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, - struct wined3d_device *device, struct wined3d_swapchain_desc *desc, - struct wined3d_swapchain_state_parent *state_parent, void *parent, - const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; - /***************************************************************************** * Utility function prototypes */ @@ -5545,6 +5515,8 @@ struct wined3d_format enum wined3d_format_id typeless_id; }; +#include "wined3d_vk.h" + const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int bind_flags) DECLSPEC_HIDDEN; enum wined3d_format_id wined3d_get_typed_format_id(const struct wined3d_adapter *adapter, diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 64e11cb7be8..0d5d120b271 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -993,4 +993,32 @@ HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +struct wined3d_swapchain_vk +{ + struct wined3d_swapchain s; + + VkSwapchainKHR vk_swapchain; + VkSurfaceKHR vk_surface; + VkImage *vk_images; + struct + { + VkSemaphore available; + VkSemaphore presentable; + uint64_t command_buffer_id; + } *vk_semaphores; + unsigned int current, image_count; + unsigned int width, height; +}; + +static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_swapchain *swapchain) +{ + return CONTAINING_RECORD(swapchain, struct wined3d_swapchain_vk, s); +} + +void wined3d_swapchain_vk_cleanup(struct wined3d_swapchain_vk *swapchain_vk) DECLSPEC_HIDDEN; +HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, + struct wined3d_device *device, struct wined3d_swapchain_desc *desc, + struct wined3d_swapchain_state_parent *state_parent, void *parent, + const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Hans Leidekker : secur32/tests: Fix a test failure and extend tests.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: f74e119217b59a24dd56ca8106f8069275676d3f URL: https://gitlab.winehq.org/wine/wine/-/commit/f74e119217b59a24dd56ca8106f806… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 13:04:57 2023 +0200 secur32/tests: Fix a test failure and extend tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55114 --- dlls/secur32/tests/schannel.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index fc5d501ff39..c3e9314c5e8 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1900,6 +1900,7 @@ static void test_dtls(void) static void test_connection_shutdown(void) { static const BYTE message[] = {0x15, 0x03, 0x01, 0x00, 0x02, 0x01, 0x00}; + static const BYTE message2[] = {0x15, 0x03, 0x01, 0x00, 0x02, 0x02, 0x2a}; CtxtHandle context, context2; SecBufferDesc buffers[2]; SECURITY_STATUS status; @@ -1918,7 +1919,7 @@ static void test_connection_shutdown(void) &cred, NULL, NULL, &cred_handle, NULL ); ok( status == SEC_E_OK, "got %08lx\n", status ); - init_buffers( &buffers[0], 2, 0 ); + init_buffers( &buffers[0], 2, 24 ); init_buffers( &buffers[1], 1, 1000 ); buffers[0].cBuffers = 1; buffers[0].pBuffers[0].BufferType = SECBUFFER_EMPTY; @@ -2012,13 +2013,12 @@ static void test_connection_shutdown(void) status = ApplyControlToken( &context, buffers ); ok( status == SEC_E_OK, "got %08lx.\n", status ); - buf->cbBuffer = 1000; + buffers[1].pBuffers[0].cbBuffer = 1000; status = InitializeSecurityContextA( &cred_handle, &context, NULL, 0, 0, 0, - NULL, 0, NULL, &buffers[0], &attrs, NULL ); + NULL, 0, NULL, &buffers[1], &attrs, NULL ); ok( status == SEC_E_OK, "got %08lx.\n", status ); - ok( buf->cbBuffer == sizeof(message), "got cbBuffer %#lx.\n", buf->cbBuffer ); - ok( !memcmp( buf->pvBuffer, message, sizeof(message) ), "message data mismatch.\n" ); - free_buffers( &buffers[0] ); + ok( buffers[1].pBuffers[0].cbBuffer == sizeof(message), "got cbBuffer %#lx.\n", buffers[1].pBuffers[0].cbBuffer ); + ok( !memcmp( buffers[1].pBuffers[0].pvBuffer, message, sizeof(message) ), "message data mismatch.\n" ); alert.dwTokenType = SCHANNEL_ALERT; alert.dwAlertType = TLS1_ALERT_FATAL; @@ -2028,10 +2028,14 @@ static void test_connection_shutdown(void) status = ApplyControlToken( &context, buffers ); ok( status == SEC_E_OK, "got %08lx.\n", status ); + buffers[1].pBuffers[0].cbBuffer = 1000; status = InitializeSecurityContextA( &cred_handle, &context, NULL, 0, 0, 0, NULL, 0, NULL, &buffers[1], &attrs, NULL ); ok( status == SEC_E_OK, "got %08lx.\n", status ); + ok( buffers[1].pBuffers[0].cbBuffer == sizeof(message2), "got cbBuffer %#lx.\n", buffers[1].pBuffers[0].cbBuffer ); + ok( !memcmp( buffers[1].pBuffers[0].pvBuffer, message2, sizeof(message2) ), "message data mismatch.\n" ); + free_buffers( &buffers[0] ); free_buffers( &buffers[1] ); DeleteSecurityContext( &context ); FreeCredentialsHandle( &cred_handle );

1 0

Zebediah Figura : wined3d: Move struct wined3d_unordered_access_view_vk to wined3d_vk.h.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 63df7fc677f6b9879fad5d5f190cd24d88cb355d URL: https://gitlab.winehq.org/wine/wine/-/commit/63df7fc677f6b9879fad5d5f190cd2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 15:28:37 2022 -0600 wined3d: Move struct wined3d_unordered_access_view_vk to wined3d_vk.h. --- dlls/wined3d/wined3d_private.h | 33 ++------------------------------- dlls/wined3d/wined3d_vk.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aedfc3f789f..9c52f1c7eaf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4913,37 +4913,6 @@ HRESULT wined3d_unordered_access_view_gl_init(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; -#include "wined3d_vk.h" - -struct wined3d_unordered_access_view_vk -{ - struct wined3d_unordered_access_view v; - struct wined3d_view_vk view_vk; - - VkBufferView vk_counter_view; - struct wined3d_bo_vk counter_bo; -}; - -static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk( - struct wined3d_unordered_access_view *view) -{ - return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v); -} - -static inline void wined3d_unordered_access_view_vk_barrier(struct wined3d_unordered_access_view_vk *uav_vk, - struct wined3d_context_vk *context_vk, uint32_t bind_mask) -{ - wined3d_resource_vk_barrier(uav_vk->v.resource, context_vk, bind_mask); -} - -void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view_vk *view_vk, - const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk, bool fp) DECLSPEC_HIDDEN; -HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, - const struct wined3d_view_desc *desc, struct wined3d_resource *resource, - void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk, - struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; - struct wined3d_swapchain_state { struct wined3d *wined3d; @@ -5026,6 +4995,8 @@ HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +#include "wined3d_vk.h" + struct wined3d_swapchain_vk { struct wined3d_swapchain s; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index d2067d5f9fb..64e11cb7be8 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -964,4 +964,33 @@ void wined3d_shader_resource_view_vk_update_buffer(struct wined3d_shader_resourc void wined3d_shader_resource_view_vk_update_layout(struct wined3d_shader_resource_view_vk *srv_vk, VkImageLayout layout) DECLSPEC_HIDDEN; +struct wined3d_unordered_access_view_vk +{ + struct wined3d_unordered_access_view v; + struct wined3d_view_vk view_vk; + + VkBufferView vk_counter_view; + struct wined3d_bo_vk counter_bo; +}; + +static inline struct wined3d_unordered_access_view_vk *wined3d_unordered_access_view_vk( + struct wined3d_unordered_access_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_vk, v); +} + +static inline void wined3d_unordered_access_view_vk_barrier(struct wined3d_unordered_access_view_vk *uav_vk, + struct wined3d_context_vk *context_vk, uint32_t bind_mask) +{ + wined3d_resource_vk_barrier(uav_vk->v.resource, context_vk, bind_mask); +} + +void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_uvec4 *clear_value, struct wined3d_context_vk *context_vk, bool fp) DECLSPEC_HIDDEN; +HRESULT wined3d_unordered_access_view_vk_init(struct wined3d_unordered_access_view_vk *view_vk, + const struct wined3d_view_desc *desc, struct wined3d_resource *resource, + void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void wined3d_unordered_access_view_vk_update(struct wined3d_unordered_access_view_vk *view_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + #endif /* __WINE_WINED3D_VK */

1 0

Alexandre Julliard : gitlab: Make sure that the tags are fetched before building.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: ed4104d358c2b5f53befd9d4bd49d1656c8da5ea URL: https://gitlab.winehq.org/wine/wine/-/commit/ed4104d358c2b5f53befd9d4bd49d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 12:54:42 2023 +0200 gitlab: Make sure that the tags are fetched before building. --- tools/gitlab/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 441582a99f3..8a5d5b40ac1 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -22,6 +22,7 @@ - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" - git config --global --add safe.directory $CI_PROJECT_DIR + - git fetch --tags - mkdir -p build32 build64 - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase

1 0

Alexandre Julliard : oledb32: Use nameless unions/structs.
by Alexandre Julliard July 14, 2023

July 14, 2023

Module: wine Branch: master Commit: 1ce80d35bce08b849f2b42cdc072b8c11bf48fae URL: https://gitlab.winehq.org/wine/wine/-/commit/1ce80d35bce08b849f2b42cdc072b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 09:26:24 2023 +0200 oledb32: Use nameless unions/structs. --- dlls/oledb32/dslocator.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 722032bc18b..5746b51d55c 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -20,8 +20,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "objbase.h" @@ -636,22 +634,22 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * pages[0].dwSize = sizeof(PROPSHEETPAGEW); pages[0].hInstance = instance; - pages[0].u.pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); + pages[0].pszTemplate = MAKEINTRESOURCEW(IDD_PROVIDER); pages[0].pfnDlgProc = data_link_properties_dlg_proc; pages[1].dwSize = sizeof(PROPSHEETPAGEW); pages[1].hInstance = instance; - pages[1].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); + pages[1].pszTemplate = MAKEINTRESOURCEW(IDD_CONNECTION); pages[1].pfnDlgProc = data_link_connection_dlg_proc; pages[2].dwSize = sizeof(PROPSHEETPAGEW); pages[2].hInstance = instance; - pages[2].u.pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); + pages[2].pszTemplate = MAKEINTRESOURCEW(IDD_ADVANCED); pages[2].pfnDlgProc = data_link_advanced_dlg_proc; pages[3].dwSize = sizeof(pages[0]); pages[3].hInstance = instance; - pages[3].u.pszTemplate = MAKEINTRESOURCEW(IDD_ALL); + pages[3].pszTemplate = MAKEINTRESOURCEW(IDD_ALL); pages[3].pfnDlgProc = data_link_all_dlg_proc; memset(&hdr, 0, sizeof(hdr)); @@ -660,7 +658,7 @@ static HRESULT WINAPI dslocator_PromptNew(IDataSourceLocator *iface, IDispatch * hdr.dwFlags = PSH_NOAPPLYNOW | PSH_PROPSHEETPAGE; hdr.hInstance = instance; hdr.pszCaption = MAKEINTRESOURCEW(IDS_PROPSHEET_TITLE); - hdr.u3.ppsp = pages; + hdr.ppsp = pages; hdr.nPages = ARRAY_SIZE(pages); ret = PropertySheetW(&hdr);

1 0