November 2022 - Wine-commits

Zebediah Figura : d3d9/tests: Test drawing from a managed texture after Reset().
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: e4cd936679d9b9e505d600c68f3ac06201c60f08 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4cd936679d9b9e505d600c68f3ac0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 20 20:04:29 2022 -0500 d3d9/tests: Test drawing from a managed texture after Reset(). --- dlls/d3d9/tests/visual.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d8fa298d6c7..fc30090562f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28,6 +28,7 @@ * causes visible results in games can be tested in a way that does not depend on pixel exactness */ +#include <stdbool.h> #include <limits.h> #include <math.h> @@ -51,6 +52,14 @@ struct vec4 float x, y, z, w; }; +struct d3d9_test_context +{ + HWND window; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + IDirect3DSurface9 *backbuffer; +}; + static HWND create_window(void) { HWND hwnd; @@ -249,8 +258,9 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) return ret; } -#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) -static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b, false) +#define check_rt_color_todo(a, b) check_rt_color_(__LINE__, a, b, true) +static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color, bool todo) { unsigned int color = 0xdeadbeef; struct surface_readback rb; @@ -274,7 +284,8 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); + todo_wine_if (todo) + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -315,6 +326,101 @@ static void cleanup_device(IDirect3DDevice9 *device) } } +static bool init_test_context(struct d3d9_test_context *context) +{ + HRESULT hr; + + memset(context, 0, sizeof(*context)); + + context->window = create_window(); + context->d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!context->d3d, "Failed to create a D3D object.\n"); + if (!(context->device = create_device(context->d3d, context->window, context->window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(context->d3d); + DestroyWindow(context->window); + return false; + } + + hr = IDirect3DDevice9_GetRenderTarget(context->device, 0, &context->backbuffer); + ok(hr == S_OK, "Failed to get backbuffer, hr %#lx.\n", hr); + + return true; +} + +#define release_test_context(a) release_test_context_(__LINE__, a) +static void release_test_context_(unsigned int line, struct d3d9_test_context *context) +{ + ULONG refcount; + + IDirect3DSurface9_Release(context->backbuffer); + refcount = IDirect3DDevice9_Release(context->device); + ok(!refcount, "Device has %lu references left.\n", refcount); + refcount = IDirect3D9_Release(context->d3d); + ok(!refcount, "D3D object has %lu references left.\n", refcount); + DestroyWindow(context->window); +} + +static void draw_textured_quad(struct d3d9_test_context *context, IDirect3DTexture9 *texture) +{ + IDirect3DDevice9 *device = context->device; + HRESULT hr; + + static const struct + { + struct vec3 position; + struct vec2 texcoord; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, + }; + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad, sizeof(*quad)); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); +} + +static HRESULT reset_device(struct d3d9_test_context *context) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + HRESULT hr; + + IDirect3DSurface9_Release(context->backbuffer); + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = context->window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice9_Reset(context->device, &present_parameters); + + if (SUCCEEDED(hr)) + IDirect3DDevice9_GetRenderTarget(context->device, 0, &context->backbuffer); + + return hr; +} + static void test_sanity(void) { IDirect3DDevice9 *device; @@ -3901,6 +4007,15 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) ok(hr == S_OK, "Got hr %#lx.\n", hr); } +static void fill_texture(IDirect3DTexture9 *texture, DWORD color, DWORD flags) +{ + IDirect3DSurface9 *surface; + + IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + fill_surface(surface, color, flags); + IDirect3DSurface9_Release(surface); +} + static void stretchrect_test(void) { enum surface_type @@ -27723,6 +27838,37 @@ static void test_filling_convention(void) DestroyWindow(window); } +static void test_managed_reset(void) +{ + struct d3d9_test_context context; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + HRESULT hr; + + if (!init_test_context(&context)) + return; + device = context.device; + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + fill_texture(texture, 0x0000ff00, 0); + + draw_textured_quad(&context, texture); + check_rt_color(context.backbuffer, 0x0000ff00); + + hr = reset_device(&context); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + draw_textured_quad(&context, texture); + check_rt_color_todo(context.backbuffer, 0x0000ff00); + + IDirect3DTexture9_Release(texture); + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -27874,4 +28020,5 @@ START_TEST(visual) test_sample_mask(); test_dynamic_map_synchronization(); test_filling_convention(); + test_managed_reset(); }

1 0

Zebediah Figura : wined3d: Factor out a mark_managed_resource_dirty() helper.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: df70d0991208d058f693423c2ce6696aa2b53692 URL: https://gitlab.winehq.org/wine/wine/-/commit/df70d0991208d058f693423c2ce669… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 20 20:05:11 2022 -0500 wined3d: Factor out a mark_managed_resource_dirty() helper. --- dlls/wined3d/device.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c314292031d..6cf7d8a35a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5509,6 +5509,21 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) return oldVisible; } +static void mark_managed_resource_dirty(struct wined3d_resource *resource) +{ + if (resource->type != WINED3D_RTYPE_BUFFER) + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int i; + + if (texture->dirty_regions) + { + for (i = 0; i < texture->layer_count; ++i) + wined3d_texture_add_dirty_region(texture, i, NULL); + } + } +} + void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { struct wined3d_resource *resource, *cursor; @@ -5527,17 +5542,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) wined3d_cs_emit_unload_resource(device->cs, resource); } - if (resource->type != WINED3D_RTYPE_BUFFER) - { - struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int i; - - if (texture->dirty_regions) - { - for (i = 0; i < texture->layer_count; ++i) - wined3d_texture_add_dirty_region(texture, i, NULL); - } - } + mark_managed_resource_dirty(resource); } } }

1 0

Zebediah Figura : wined3d: Add a dirty rect to managed textures when resetting.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 9b62f5e57fa8da338f8c71c0251089721f075f36 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b62f5e57fa8da338f8c71c0251089… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 20 20:20:13 2022 -0500 wined3d: Add a dirty rect to managed textures when resetting. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53798 --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/device.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 05a1fc38844..434474b292d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -12119,7 +12119,7 @@ static void test_managed_reset(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color_todo(context.backbuffer, 0x0000ff00); + check_rt_color(context.backbuffer, 0x0000ff00); IDirect3DTexture8_Release(texture); release_test_context(&context); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fc30090562f..f8375d238e4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -27863,7 +27863,7 @@ static void test_managed_reset(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); draw_textured_quad(&context, texture); - check_rt_color_todo(context.backbuffer, 0x0000ff00); + check_rt_color(context.backbuffer, 0x0000ff00); IDirect3DTexture9_Release(texture); release_test_context(&context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6cf7d8a35a3..913376ee3ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5829,6 +5829,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { TRACE("Unloading resource %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); + + if (resource->usage & WINED3DUSAGE_MANAGED) + mark_managed_resource_dirty(resource); } device->adapter->adapter_ops->adapter_uninit_3d(device);

1 0

Zebediah Figura : wined3d: Always invalidate ~map_binding in texture write maps.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 11f00e8457fcc9b8a9b97de1ea7b29b37c93bccf URL: https://gitlab.winehq.org/wine/wine/-/commit/11f00e8457fcc9b8a9b97de1ea7b29… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 20 20:22:45 2022 -0500 wined3d: Always invalidate ~map_binding in texture write maps. Regardless of whether WINED3D_MAP_NO_DIRTY_UPDATE is specified. Dirty rects are independent of resource location management. --- dlls/wined3d/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f385394497b..c9d5193e291 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3748,8 +3748,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour && !(flags & WINED3D_MAP_NO_DIRTY_UPDATE) && !texture_level) wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, box); - if (flags & WINED3D_MAP_WRITE - && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) + if (flags & WINED3D_MAP_WRITE) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~resource->map_binding); wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, resource->map_binding);

1 0

Jacek Caban : winevulkan: Store parent in VkVariable.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 8047c230dbc83ea054e905ebab2b7c55841f0955 URL: https://gitlab.winehq.org/wine/wine/-/commit/8047c230dbc83ea054e905ebab2b7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 18:52:53 2022 +0100 winevulkan: Store parent in VkVariable. --- dlls/winevulkan/make_vulkan | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c7f422c3c64..493c9ad59ea 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -583,7 +583,7 @@ class VkFunction(object): params = [] for param in command.findall("param"): - vk_param = VkParam.from_xml(param, types) + vk_param = VkParam.from_xml(param, types, params) params.append(vk_param) return VkFunction(_type=func_type, name=func_name, params=params) @@ -1082,11 +1082,12 @@ class VkHandle(object): class VkVariable(object): def __init__(self, const=False, type_info=None, type=None, name=None, pointer=None, array_len=None, - dyn_array_len=None, object_type=None, optional=False, returnedonly=False): + dyn_array_len=None, object_type=None, optional=False, returnedonly=False, parent=None): self.const = const self.type_info = type_info self.type = type self.name = name + self.parent = parent self.pointer = pointer self.array_len = array_len self.dyn_array_len = dyn_array_len @@ -1214,10 +1215,10 @@ class VkVariable(object): class VkMember(VkVariable): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None, - returnedonly=False): + returnedonly=False, parent=None): VkVariable.__init__(self, const=const, type=_type, name=name, pointer=pointer, array_len=array_len, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional, - returnedonly=returnedonly) + returnedonly=returnedonly, parent=parent) self.struct_fwd_decl = struct_fwd_decl self.values = values self.bit_width = bit_width @@ -1236,7 +1237,7 @@ class VkMember(VkVariable): self.name, self.array_len, self.dyn_array_len) @staticmethod - def from_xml(member, returnedonly): + def from_xml(member, returnedonly, parent): """ Helper function for parsing a member tag within a struct or union. """ name_elem = member.find("name") @@ -1301,7 +1302,8 @@ class VkMember(VkVariable): return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, - values=values, object_type=object_type, bit_width=bit_width, returnedonly=returnedonly) + values=values, object_type=object_type, bit_width=bit_width, returnedonly=returnedonly, + parent=parent) def copy(self, input, output, direction, conv, unwrap): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1450,10 +1452,11 @@ class VkMember(VkVariable): class VkParam(VkVariable): """ Helper class which describes a parameter to a function call. """ - def __init__(self, type_info, const=None, pointer=None, name=None, array_len=None, dyn_array_len=None, object_type=None, optional=False): + def __init__(self, type_info, const=None, pointer=None, name=None, parent=None, array_len=None, + dyn_array_len=None, object_type=None, optional=False): VkVariable.__init__(self, const=const, type_info=type_info, type=type_info["name"], name=name, pointer=pointer, array_len=array_len, dyn_array_len=dyn_array_len, - object_type=object_type, optional=optional) + object_type=object_type, optional=optional, parent=parent) self._set_format_string() @@ -1461,7 +1464,7 @@ class VkParam(VkVariable): return "{0} {1} {2} {3} {4} {5}".format(self.const, self.type, self.pointer, self.name, self.array_len, self.dyn_array_len) @staticmethod - def from_xml(param, types): + def from_xml(param, types, parent): """ Helper function to create VkParam from xml. """ # Parameter parsing is slightly tricky. All the data is contained within @@ -1496,7 +1499,9 @@ class VkParam(VkVariable): if type_info is None: LOGGER.err("type info not found for: {0}".format(type_elem.text)) - return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, dyn_array_len=dyn_array_len, object_type=object_type, optional=optional) + return VkParam(type_info, const=const, pointer=pointer, name=name, array_len=array_len, + dyn_array_len=dyn_array_len, object_type=object_type, optional=optional, + parent=parent) def _set_format_string(self): """ Internal helper function to be used by constructor to set format string. """ @@ -1757,7 +1762,7 @@ class VkStruct(Sequence): members = [] for member in struct.findall("member"): - vk_member = VkMember.from_xml(member, returnedonly) + vk_member = VkMember.from_xml(member, returnedonly, members) members.append(vk_member) return VkStruct(name, members, returnedonly, structextends, union=union)

1 0

Jacek Caban : winevulkan: Support pointer dynamic array lengths.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 95d83f019d26de94f87a2a06345df8c072f9a3e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/95d83f019d26de94f87a2a06345df8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 20:21:58 2022 +0100 winevulkan: Support pointer dynamic array lengths. --- dlls/winevulkan/make_vulkan | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 493c9ad59ea..0ca2552240f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1097,6 +1097,10 @@ class VkVariable(object): if type_info: self.set_type_info(type_info) + def __eq__(self, other): + """ Compare member based on name against a string. """ + return self.name == other + def set_type_info(self, type_info): """ Helper function to set type information from the type registry. This is needed, because not all type data is available at time of @@ -1106,6 +1110,31 @@ class VkVariable(object): self.handle = type_info["data"] if type_info["category"] == "handle" else None self.struct = type_info["data"] if type_info["category"] == "struct" else None + def get_dyn_array_len(self, prefix): + if isinstance(self.dyn_array_len, int): + return self.dyn_array_len + + len_str = self.dyn_array_len + parent = self.parent + len = prefix + + # check if lenght is a member of another struct (for example pAllocateInfo->commandBufferCount) + i = len_str.find("->") + if i != -1: + var = parent[parent.index(len_str[0:i])] + len_str = len_str[i+2:] + len += var.name + "->" + parent = var.struct.members + + len += len_str + if not len_str in parent: + return len + + var = parent[parent.index(len_str)] + if var.is_pointer(): + len = "*" + len + return len + def is_const(self): return self.const @@ -1223,15 +1252,6 @@ class VkMember(VkVariable): self.values = values self.bit_width = bit_width - def __eq__(self, other): - """ Compare member based on name against a string. - - This method is for convenience by VkStruct, which holds a number of members and needs quick checking - if certain members exist. - """ - - return self.name == other - def __repr__(self): return "{0} {1} {2} {3} {4} {5} {6}".format(self.const, self.struct_fwd_decl, self.type, self.pointer, self.name, self.array_len, self.dyn_array_len) @@ -1313,7 +1333,7 @@ class VkMember(VkVariable): if self.needs_conversion(conv, unwrap, direction, False): if self.is_dynamic_array(): # Array length is either a variable name (string) or an int. - count = self.dyn_array_len if isinstance(self.dyn_array_len, int) else "{0}{1}".format(input, self.dyn_array_len) + count = self.get_dyn_array_len(input) host_part = "host" if unwrap else "unwrapped_host" if direction == Direction.OUTPUT: return "convert_{2}_array_{6}_to_{5}({3}{1}, {0}{1}, {4});\n".format(output, self.name, self.type, input, count, win_type, host_part) @@ -1557,7 +1577,8 @@ class VkParam(VkVariable): ctx_param = "&ctx, " if self.needs_alloc(conv, unwrap) else "" wrap_part = "" if unwrap or not self.needs_unwrapping() else "unwrapped_" if self.is_dynamic_array(): - return " {1}_host = convert_{2}_array_{4}_to_{6}host({5}{0}{1}, {0}{3});\n".format(prefix, self.name, self.type, self.dyn_array_len, win_type, ctx_param, wrap_part) + return " {1}_host = convert_{2}_array_{4}_to_{6}host({5}{0}{1}, {3});\n".format( + prefix, self.name, self.type, self.get_dyn_array_len(prefix), win_type, ctx_param, wrap_part) else: return " convert_{0}_{3}_to_{5}host({4}{1}{2}, &{2}_host);\n".format(self.type, prefix, self.name, win_type, ctx_param, wrap_part) else:

1 0

Jacek Caban : winevulkan: Use generated thunks for vkGetImageSparseMemoryRequirements(2) conversion.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: edbb9eced2b10897b4468e490cc85f463056f80e URL: https://gitlab.winehq.org/wine/wine/-/commit/edbb9eced2b10897b4468e490cc85f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 21:47:53 2022 +0100 winevulkan: Use generated thunks for vkGetImageSparseMemoryRequirements(2) conversion. --- dlls/winevulkan/make_vulkan | 19 ++----- dlls/winevulkan/vulkan_thunks.c | 118 ++++++++++++++++++++++++++++++++++++++-- dlls/winevulkan/vulkan_thunks.h | 35 ++++++++++-- 3 files changed, 149 insertions(+), 23 deletions(-)

1 0

Jacek Caban : winevulkan: Use const types in conversion function declarations.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 4c0ec72127b19baae2af9cdc42c9f6ebdcf0a4de URL: https://gitlab.winehq.org/wine/wine/-/commit/4c0ec72127b19baae2af9cdc42c9f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 7 23:44:08 2022 +0100 winevulkan: Use const types in conversion function declarations. --- dlls/winevulkan/make_vulkan | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e3ed02c8abf..b666c8c589c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2079,14 +2079,17 @@ class StructConversionFunction(object): needs_alloc = self.direction != Direction.OUTPUT and self.operand.needs_alloc(self.conv, self.unwrap) host_type = self.type + "_host" if self.operand.needs_host_type() else self.type + win_type = self.type + if self.direction == Direction.OUTPUT and self.const: + win_type = "const " + win_type if self.conv: body += "static inline void {0}(".format(self.name) if self.direction == Direction.OUTPUT: - params = ["const {0} *in".format(host_type), "{0} *out".format(self.type)] + params = ["const {0} *in".format(host_type), "{0} *out".format(win_type)] else: - params = ["const {0} *in".format(self.type), "{0} *out".format(host_type)] + params = ["const {0} *in".format(win_type), "{0} *out".format(host_type)] # Generate parameter list if needs_alloc: @@ -2241,13 +2244,16 @@ class ArrayConversionFunction(object): host_type = "{0}_host".format(self.type) else: host_type = self.type + win_type = self.type + if self.direction == Direction.OUTPUT and self.array.is_const(): + win_type = "const " + win_type if self.conv: if self.direction == Direction.OUTPUT: - params = ["const {0} *in".format(host_type), "{0} *out".format(self.type), "uint32_t count"] + params = ["const {0} *in".format(host_type), "{0} *out".format(win_type), "uint32_t count"] return_type = None else: - params = ["const {0} *in".format(self.type), "uint32_t count"] + params = ["const {0} *in".format(win_type), "uint32_t count"] return_type = host_type else: params = ["const {0} *in".format(self.type), "uint32_t count"]

1 0

Jacek Caban : winevulkan: Convert struct chain conversions for all structs that need it.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 9ff9f81855cfb7730b47b0e35a6de4cf12bb2cf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff9f81855cfb7730b47b0e35a6de4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 00:36:50 2022 +0100 winevulkan: Convert struct chain conversions for all structs that need it. --- dlls/winevulkan/make_vulkan | 183 +- dlls/winevulkan/vulkan_thunks.c | 4693 +++++++++++++++++++++++++++++++++------ dlls/winevulkan/vulkan_thunks.h | 534 ++++- 3 files changed, 4614 insertions(+), 796 deletions(-)

1 0

Jacek Caban : winevulkan: Use generated thunks for VkPipelineCreationFeedback conversion.
by Alexandre Julliard 09 Nov '22

09 Nov '22

Module: wine Branch: master Commit: 923aa288aa06e7686db3333408bd474f8d02260e URL: https://gitlab.winehq.org/wine/wine/-/commit/923aa288aa06e7686db3333408bd47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 8 01:25:00 2022 +0100 winevulkan: Use generated thunks for VkPipelineCreationFeedback conversion. --- dlls/winevulkan/make_vulkan | 15 -- dlls/winevulkan/vulkan.c | 115 --------------- dlls/winevulkan/vulkan_thunks.c | 314 ++++++++++++++++++++++++++++++++++++++-- dlls/winevulkan/vulkan_thunks.h | 29 +++- 4 files changed, 323 insertions(+), 150 deletions(-)

1 0