wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Matteo Bruni : include: Update d3d9 headers.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 2c1a8b3b774e2ffe9b13c9e0446e4e1864a610ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1a8b3b774e2ffe9b13c9e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:42 2018 -0600 include: Update d3d9 headers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 37 +++++++++++-------- include/d3d9types.h | 101 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 88 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c1a8b3b774e2ffe9b13…

1 0

Matteo Bruni : include: Add d3d9 enum values and defines for dual source blending.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 5147ffe42e626e4c165c4767dfa3cf2d62bfe846 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5147ffe42e626e4c165c4767… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:41 2018 -0600 include: Add d3d9 enum values and defines for dual source blending. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9caps.h | 32 ++++++++++++++++++-------------- include/d3d9types.h | 4 ++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 424b20c..24ba14c 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -73,20 +73,24 @@ #define D3DLINECAPS_FOG 0x10 #define D3DLINECAPS_ANTIALIAS 0x20 -#define D3DPBLENDCAPS_ZERO 0x00000001 -#define D3DPBLENDCAPS_ONE 0x00000002 -#define D3DPBLENDCAPS_SRCCOLOR 0x00000004 -#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 -#define D3DPBLENDCAPS_SRCALPHA 0x00000010 -#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020 -#define D3DPBLENDCAPS_DESTALPHA 0x00000040 -#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080 -#define D3DPBLENDCAPS_DESTCOLOR 0x00000100 -#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 -#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400 -#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 -#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 -#define D3DPBLENDCAPS_BLENDFACTOR 0x00002000 +#define D3DPBLENDCAPS_ZERO __MSABI_LONG(0x00000001) +#define D3DPBLENDCAPS_ONE __MSABI_LONG(0x00000002) +#define D3DPBLENDCAPS_SRCCOLOR __MSABI_LONG(0x00000004) +#define D3DPBLENDCAPS_INVSRCCOLOR __MSABI_LONG(0x00000008) +#define D3DPBLENDCAPS_SRCALPHA __MSABI_LONG(0x00000010) +#define D3DPBLENDCAPS_INVSRCALPHA __MSABI_LONG(0x00000020) +#define D3DPBLENDCAPS_DESTALPHA __MSABI_LONG(0x00000040) +#define D3DPBLENDCAPS_INVDESTALPHA __MSABI_LONG(0x00000080) +#define D3DPBLENDCAPS_DESTCOLOR __MSABI_LONG(0x00000100) +#define D3DPBLENDCAPS_INVDESTCOLOR __MSABI_LONG(0x00000200) +#define D3DPBLENDCAPS_SRCALPHASAT __MSABI_LONG(0x00000400) +#define D3DPBLENDCAPS_BOTHSRCALPHA __MSABI_LONG(0x00000800) +#define D3DPBLENDCAPS_BOTHINVSRCALPHA __MSABI_LONG(0x00001000) +#define D3DPBLENDCAPS_BLENDFACTOR __MSABI_LONG(0x00002000) +#ifndef D3D_DISABLE_9EX +#define D3DPBLENDCAPS_SRCCOLOR2 __MSABI_LONG(0x00004000) +#define D3DPBLENDCAPS_INVSRCCOLOR2 __MSABI_LONG(0x00008000) +#endif #define D3DPCMPCAPS_NEVER 0x01 #define D3DPCMPCAPS_LESS 0x02 diff --git a/include/d3d9types.h b/include/d3d9types.h index ed14e9b..bb7e3a0 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -679,6 +679,10 @@ typedef enum _D3DBLEND { D3DBLEND_BOTHINVSRCALPHA = 13, D3DBLEND_BLENDFACTOR = 14, D3DBLEND_INVBLENDFACTOR = 15, +#ifndef D3D_DISABLE_9EX + D3DBLEND_SRCCOLOR2 = 16, + D3DBLEND_INVSRCCOLOR2 = 17, +#endif D3DBLEND_FORCE_DWORD = 0x7fffffff } D3DBLEND;

1 0

Matteo Bruni : d3d9/tests: Add a visual test for D3DUSAGE_AUTOGENMIPMAP with unsupported format.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: 009765bb630916a74295f165827833d4aa11a316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=009765bb630916a74295f165… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:40 2018 -0600 d3d9/tests: Add a visual test for D3DUSAGE_AUTOGENMIPMAP with unsupported format. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3686fc6..358ed1d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6455,6 +6455,76 @@ static void test_mipmap_autogen(void) color = getPixelColor(device, 440, 270); ok(color == 0x0000ff00, "Unexpected color 0x%08x.\n", color); + /* Test format not supporting D3DUSAGE_AUTOGENMIPMAP. */ + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_A1R5G5B5); + if (hr != D3DOK_NOAUTOGEN) + { + skip("D3DFMT_A1R5G5B5 support is not D3DOK_NOAUTOGEN (%#x).\n", hr); + } + else + { + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 0, D3DUSAGE_AUTOGENMIPMAP, + D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &texture, 0); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, 0); + ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); + for (y = 0; y < 1024; ++y) + { + for (x = 0; x < 1024; ++x) + { + WORD *dst = (WORD *)(((BYTE *)lr.pBits) + y * lr.Pitch + x * 2); + POINT pt; + + pt.x = x; + pt.y = y; + if (PtInRect(&r1, pt)) + *dst = 0xfc00; + else if (PtInRect(&r2, pt)) + *dst = 0x83e0; + else if (PtInRect(&r3, pt)) + *dst = 0x801f; + else if (PtInRect(&r4, pt)) + *dst = 0x8000; + else + *dst = 0xffff; + } + } + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Failed to unmap texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 5 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + color = getPixelColor(device, 200, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 200); + ok(color == 0x000000ff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 200); + ok(color == 0x00000000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 200); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 200, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 280, 270); + ok(color == 0x00ff0000, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 360, 270); + ok(color == 0x0000ff00, "Unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 440, 270); + ok(color == 0x00ffffff, "Unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + } + IDirect3DSurface9_Release(backbuffer); refcount = IDirect3DDevice9_Release(device);

1 0

Matteo Bruni : d3d9: Create single-level textures if the format doesn' t support AUTOGENMIPMAP.
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: ec74a30a180728820f1d720094ba09cdfeb6aed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec74a30a180728820f1d7200… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 9 12:10:39 2018 -0600 d3d9: Create single-level textures if the format doesn't support AUTOGENMIPMAP. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index e7efe73..0858be9 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1339,9 +1339,22 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, WARN("D3DUSAGE_AUTOGENMIPMAP texture with %u levels, returning D3DERR_INVALIDCALL.\n", levels); return D3DERR_INVALIDCALL; } - flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + wined3d_mutex_lock(); + hr = wined3d_check_device_format(device->d3d_parent->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, WINED3DFMT_B8G8R8A8_UNORM, + WINED3DUSAGE_TEXTURE | WINED3DUSAGE_QUERY_GENMIPMAP, WINED3D_RTYPE_TEXTURE_2D, wined3dformat_from_d3dformat(format)); + wined3d_mutex_unlock(); + if (hr == D3D_OK) + { + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + levels = 0; + } + else + { + WARN("D3DUSAGE_AUTOGENMIPMAP not supported on D3DFORMAT %#x, creating a texture " + "with a single level.\n", format); + levels = 1; + } texture->autogen_filter_type = D3DTEXF_LINEAR; - levels = 0; } else {

1 0

Matteo Bruni : wined3d: Restore the correct sub resource in texture2d_load_fb_texture().
by Alexandre Julliard 12 Mar '18

12 Mar '18

Module: wine Branch: master Commit: cca2867b3c9eab1730c34ec82ecaf82823196520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cca2867b3c9eab1730c34ec8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 12 12:54:45 2018 +0330 wined3d: Restore the correct sub resource in texture2d_load_fb_texture(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fa25b03..e98541c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1518,7 +1518,7 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, checkGLcall("glCopyTexSubImage2D"); if (restore_texture) - context_restore(context, restore_texture->sub_resources[sub_resource_idx].u.surface); + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Does a direct frame buffer -> texture copy. Stretching is done with single

1 0

Alexandre Julliard : ntdll: Fix extra comma in x86_64 relay traces.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: dfde1195385df5ddb11f1104a0e744596b99477f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfde1195385df5ddb11f1104… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 14:13:05 2018 -0600 ntdll: Fix extra comma in x86_64 relay traces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 22ce172..255a525 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -745,7 +745,7 @@ DECLSPEC_HIDDEN void * WINAPI relay_trace_entry( struct relay_descr *descr, unsi TRACE( "%08lx", stack[i] ); break; } - if (!is_ret_val( arg_types[i] )) TRACE( "," ); + if (!is_ret_val( arg_types[i+1] )) TRACE( "," ); } *nb_args = i; TRACE( ") ret=%08lx\n", stack[-1] );

1 0

Alexandre Julliard : ntdll: Avoid pushl %esp instruction in RtlUnwind prolog.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 342e2cabd21c5a836683ac30e260ec4944eeac6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=342e2cabd21c5a836683ac30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 13:47:01 2018 -0600 ntdll: Avoid pushl %esp instruction in RtlUnwind prolog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 71eff66..17c42cd 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2441,7 +2441,9 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -(0x2cc+8)(%esp),%esp\n\t" /* sizeof(CONTEXT) + alignment */ - "pushl %esp\n\t" /* context */ + "pushl %eax\n\t" + "leal 4(%esp),%eax\n\t" /* context */ + "xchgl %eax,(%esp)\n\t" "call " __ASM_NAME("RtlCaptureContext") __ASM_STDCALL(4) "\n\t" "leal 24(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */

1 0

Roderick Colenbrander : winevulkan: Implement vkDestroyDevice.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 563f1b22005519037cd68bc39f71f61db1597798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=563f1b22005519037cd68bc3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:50 2018 -0800 winevulkan: Implement vkDestroyDevice. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 10 ++++++++++ dlls/winevulkan/vulkan_thunks.c | 5 ----- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 208d26b..04896da 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -94,6 +94,7 @@ FUNCTION_OVERRIDES = { "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, # Device functions + "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index ee877e0..678506f 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -271,6 +271,16 @@ err: return res; } +void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator) +{ + TRACE("%p %p\n", device, allocator); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + wine_vk_device_free(device); +} + void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator) { TRACE("%p, %p\n", instance, allocator); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 13a5d5d..3670926 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -570,11 +570,6 @@ static void WINAPI wine_vkDestroyDescriptorSetLayout(VkDevice device, VkDescript FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(descriptorSetLayout), pAllocator); } -static void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) -{ - FIXME("stub: %p, %p\n", device, pAllocator); -} - static void WINAPI wine_vkDestroyEvent(VkDevice device, VkEvent event, const VkAllocationCallbacks *pAllocator) { FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(event), pAllocator); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 9f5edf5..daf679b 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -14,6 +14,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) DECLSPEC_HIDDEN; +void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN;

1 0

Roderick Colenbrander : winevulkan: Implement vkGetDeviceProcAddr.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: a2a53bb6186fba3fae4bc5910eaf1cb8c2b6becd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a53bb6186fba3fae4bc591… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:49 2018 -0800 winevulkan: Implement vkGetDeviceProcAddr. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 22 ++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 6 ------ dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4028ad3..208d26b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -94,7 +94,7 @@ FUNCTION_OVERRIDES = { "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, # Device functions - "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : True}, + "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 83c94eb..ee877e0 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -352,6 +352,28 @@ VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *d return res; } +PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *name) +{ + void *func; + TRACE("%p, %s\n", device, debugstr_a(name)); + + /* The spec leaves return value undefined for a NULL device, let's just return NULL. */ + if (!device || !name) + return NULL; + + /* Per the spec, we are only supposed to return device functions as in functions + * for which the first parameter is vkDevice or a child of vkDevice like a + * vkCommandBuffer or vkQueue. + * Loader takes are of filtering of extensions which are enabled or not. + */ + func = wine_vk_get_device_proc_addr(name); + if (func) + return func; + + TRACE("Function %s not found\n", debugstr_a(name)); + return NULL; +} + static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f02ee3e..13a5d5d 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -690,12 +690,6 @@ static void WINAPI wine_vkGetDeviceMemoryCommitment(VkDevice device, VkDeviceMem FIXME("stub: %p, 0x%s, %p\n", device, wine_dbgstr_longlong(memory), pCommittedMemoryInBytes); } -static PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) -{ - FIXME("stub: %p, %p\n", device, pName); - return NULL; -} - static void WINAPI wine_vkGetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue *pQueue) { FIXME("stub: %p, %u, %u, %p\n", device, queueFamilyIndex, queueIndex, pQueue); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index f98307c9..9f5edf5 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -17,6 +17,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDev void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; +PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *pName) DECLSPEC_HIDDEN; typedef struct VkImageFormatProperties_host {

1 0

Roderick Colenbrander : winevulkan: Implement vkCreateDevice.
by Alexandre Julliard 09 Mar '18

09 Mar '18

Module: wine Branch: master Commit: 6eacdf38e29dcf2d87cb91374fd46987603f5594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eacdf38e29dcf2d87cb9137… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Mar 9 08:48:48 2018 -0800 winevulkan: Implement vkCreateDevice. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 39 +++++- dlls/winevulkan/vulkan.c | 70 ++++++++++- dlls/winevulkan/vulkan_private.h | 8 ++ dlls/winevulkan/vulkan_thunks.c | 6 - dlls/winevulkan/vulkan_thunks.h | 248 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/vulkan.c | 9 ++ include/wine/vulkan_driver.h | 3 +- 7 files changed, 371 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6eacdf38e29dcf2d87cb…

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
79
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 March 2018