May 2019 - Wine-Commits - list.winehq.org

Louis Lenders : advapi32: Add InitiateShutdown{A,W} stub.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 8c61f824f97e11130defb23da458f5b2a76eaae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c61f824f97e11130defb23d… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 6 19:46:29 2019 +0200 advapi32: Add InitiateShutdown{A,W} stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47131 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 18 ++++++++++++++++++ dlls/advapi32/advapi32.spec | 4 ++-- include/winreg.h | 3 +++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 1c528ef..433c258 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -268,6 +268,24 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO SHTDN_REASON_MAJOR_LEGACY_API ); } +/*********************************************************************** + * InitiateShutdownA [ADVAPI32.@] + */ +DWORD WINAPI InitiateShutdownA(char *name, char *message, DWORD seconds, DWORD flags, DWORD reason) +{ + FIXME("%s, %s, %d, %d, %d stub\n", debugstr_a(name), debugstr_a(message), seconds, flags, reason); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * InitiateShutdownW [ADVAPI32.@] + */ +DWORD WINAPI InitiateShutdownW(WCHAR *name, WCHAR *message, DWORD seconds, DWORD flags, DWORD reason) +{ + FIXME("%s, %s, %d, %d, %d stub\n", debugstr_w(name), debugstr_w(message), seconds, flags, reason); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) { diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index dd4102e..91d6750 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -405,8 +405,8 @@ @ stdcall InitializeAcl(ptr long long) @ stdcall InitializeSecurityDescriptor(ptr long) @ stdcall InitializeSid(ptr ptr long) -# @ stub InitiateShutdownA -# @ stub InitiateShutdownW +@ stdcall InitiateShutdownA(str str long long long) +@ stdcall InitiateShutdownW(wstr wstr long long long) @ stdcall InitiateSystemShutdownA(str str long long long) @ stdcall InitiateSystemShutdownExA(str str long long long long) @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) diff --git a/include/winreg.h b/include/winreg.h index 45057df..bc001c8 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -91,6 +91,9 @@ typedef LONG LSTATUS; WINADVAPI BOOL WINAPI AbortSystemShutdownA(LPSTR); WINADVAPI BOOL WINAPI AbortSystemShutdownW(LPWSTR); #define AbortSystemShutdown WINELIB_NAME_AW(AbortSystemShutdown) +WINADVAPI DWORD WINAPI InitiateShutdownA(char*,char*,DWORD,DWORD,DWORD); +WINADVAPI DWORD WINAPI InitiateShutdownW(WCHAR*,WCHAR*,DWORD,DWORD,DWORD); +#define InitiateShutdown WINELIB_NAME_AW(InitiateShutdown) WINADVAPI BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); WINADVAPI BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); #define InitiateSystemShutdown WINELIB_NAME_AW(InitiateSystemShutdown)

1 0

Nikolay Sivov : mf: Implement CloneFrom() for nodes.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 71397e6ebf0171b894663c7bc583b970601cdae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71397e6ebf0171b894663c7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:45 2019 +0300 mf: Implement CloneFrom() for nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index f40fe00..298200c 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1078,18 +1078,15 @@ static HRESULT WINAPI topology_node_CopyAllItems(IMFTopologyNode *iface, IMFAttr return IMFAttributes_CopyAllItems(node->attributes, dest); } -static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) +static HRESULT topology_node_set_object(struct topology_node *node, IUnknown *object) { static const GUID *iids[3] = { &IID_IPersist, &IID_IPersistStorage, &IID_IPersistPropertyBag }; - struct topology_node *node = impl_from_IMFTopologyNode(iface); IPersist *persist = NULL; BOOL has_object_id; GUID object_id; unsigned int i; HRESULT hr; - TRACE("%p, %p.\n", iface, object); - has_object_id = IMFAttributes_GetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id) == S_OK; if (object && !has_object_id) @@ -1130,6 +1127,15 @@ static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown * return S_OK; } +static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) +{ + struct topology_node *node = impl_from_IMFTopologyNode(iface); + + TRACE("%p, %p.\n", iface, object); + + return topology_node_set_object(node, object); +} + static HRESULT WINAPI topology_node_GetObject(IMFTopologyNode *iface, IUnknown **object) { struct topology_node *node = impl_from_IMFTopologyNode(iface); @@ -1367,11 +1373,44 @@ static HRESULT WINAPI topology_node_GetInputPrefType(IMFTopologyNode *iface, DWO return hr; } -static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopologyNode *src_node) { - FIXME("(%p)->(%p)\n", iface, node); + struct topology_node *node = impl_from_IMFTopologyNode(iface); + MF_TOPOLOGY_TYPE node_type; + IUnknown *object; + TOPOID topoid; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, src_node); + + if (FAILED(hr = IMFTopologyNode_GetNodeType(src_node, &node_type))) + return hr; + + if (node->node_type != node_type) + return MF_E_INVALIDREQUEST; + + if (FAILED(hr = IMFTopologyNode_GetTopoNodeID(src_node, &topoid))) + return hr; + + object = NULL; + IMFTopologyNode_GetObject(src_node, &object); + + EnterCriticalSection(&node->cs); + + hr = IMFTopologyNode_CopyAllItems(src_node, node->attributes); + + if (SUCCEEDED(hr)) + hr = topology_node_set_object(node, object); + + if (SUCCEEDED(hr)) + node->id = topoid; + + LeaveCriticalSection(&node->cs); + + if (object) + IUnknown_Release(object); + + return hr; } static const IMFTopologyNodeVtbl topologynodevtbl =

1 0

Józef Kucia : wined3d: Query Vulkan shared system memory.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 5d117c76b951fb451c6a07949854417b9dc5d4b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d117c76b951fb451c6a0794… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 11:03:37 2019 +0200 wined3d: Query Vulkan shared system memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 9 ++++++--- dlls/wined3d/directx.c | 19 +++++++++++-------- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index cedd012..866cfec 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3855,7 +3855,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, } fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor, gpu_description->vendor, gpu_description->device); - wined3d_driver_info_init(driver_info, gpu_description, vram_bytes); + wined3d_driver_info_init(driver_info, gpu_description, vram_bytes, 0); TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", driver_info->version_high, driver_info->version_low); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8fd9adf..0d5e2f5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -635,8 +635,8 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, { const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; + UINT64 vram_bytes, sysmem_bytes; const VkMemoryHeap *heap; - UINT64 vram_bytes; unsigned int i; TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); @@ -644,15 +644,18 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); - for (i = 0, vram_bytes = 0; i < memory_properties->memoryHeapCount; ++i) + for (i = 0, vram_bytes = 0, sysmem_bytes = 0; i < memory_properties->memoryHeapCount; ++i) { heap = &memory_properties->memoryHeaps[i]; TRACE("Memory heap [%u]: flags %#x, size 0x%s.\n", i, heap->flags, wine_dbgstr_longlong(heap->size)); if (heap->flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) vram_bytes += heap->size; + else + sysmem_bytes += heap->size; } TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); + TRACE("Total shared system memory: 0x%s.\n", wine_dbgstr_longlong(sysmem_bytes)); if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); @@ -671,7 +674,7 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, gpu_description = &description; } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes); + wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes, sysmem_bytes); } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c909e51..be7e818 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -541,7 +541,7 @@ static void wined3d_copy_name(char *dst, const char *src, unsigned int dst_size) } void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, - const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) + const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes, UINT64 sysmem_bytes) { const struct driver_version_information *version_info; enum wined3d_driver_model driver_model; @@ -637,12 +637,15 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vram_bytes = LONG_MAX; } - driver_info->sysmem_bytes = 64 * 1024 * 1024; - memory_status.dwLength = sizeof(memory_status); - if (GlobalMemoryStatusEx(&memory_status)) - driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); - else - ERR("Failed to get global memory status.\n"); + if (!(driver_info->sysmem_bytes = sysmem_bytes)) + { + driver_info->sysmem_bytes = 64 * 1024 * 1024; + memory_status.dwLength = sizeof(memory_status); + if (GlobalMemoryStatusEx(&memory_status)) + driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); + else + ERR("Failed to get global memory status.\n"); + } /* Try to obtain driver version information for the current Windows version. This fails in * some cases: @@ -2305,7 +2308,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0); + wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbcda94..221ca6e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2701,7 +2701,8 @@ struct wined3d_driver_info }; void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, - const struct wined3d_gpu_description *gpu_description, UINT64 vram_bytes) DECLSPEC_HIDDEN; + const struct wined3d_gpu_description *gpu_description, + UINT64 vram_bytes, UINT64 sysmem_bytes) DECLSPEC_HIDDEN; struct wined3d_adapter_ops {

1 0

Henri Verbeet : wined3d: Query Vulkan GPU memory.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 310638abb7a50dbc9c1eecf2b7461825780d6a1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=310638abb7a50dbc9c1eecf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 11:03:36 2019 +0200 wined3d: Query Vulkan GPU memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index da53edd..8fd9adf 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -631,20 +631,32 @@ static enum wined3d_display_driver guess_display_driver(enum wined3d_pci_vendor } static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, - const VkPhysicalDeviceProperties *properties) + const VkPhysicalDeviceProperties *properties, const VkPhysicalDeviceMemoryProperties *memory_properties) { const struct wined3d_gpu_description *gpu_description; struct wined3d_gpu_description description; + const VkMemoryHeap *heap; + UINT64 vram_bytes; + unsigned int i; TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); + for (i = 0, vram_bytes = 0; i < memory_properties->memoryHeapCount; ++i) + { + heap = &memory_properties->memoryHeaps[i]; + TRACE("Memory heap [%u]: flags %#x, size 0x%s.\n", + i, heap->flags, wine_dbgstr_longlong(heap->size)); + if (heap->flags & VK_MEMORY_HEAP_DEVICE_LOCAL_BIT) + vram_bytes += heap->size; + } + TRACE("Total device memory: 0x%s.\n", wine_dbgstr_longlong(vram_bytes)); + if (!(gpu_description = wined3d_get_user_override_gpu_description(properties->vendorID, properties->deviceID))) gpu_description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID); - /* FIXME: Get vidmem from Vulkan. */ if (!gpu_description) { FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", @@ -654,18 +666,19 @@ static void adapter_vk_init_driver_info(struct wined3d_adapter *adapter, description.device = properties->deviceID; description.description = properties->deviceName; description.driver = guess_display_driver(properties->vendorID); - description.vidmem = 0; + description.vidmem = vram_bytes; gpu_description = &description; } - wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + wined3d_driver_info_init(&adapter->driver_info, gpu_description, vram_bytes); } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkPhysicalDeviceMemoryProperties memory_properties; struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; @@ -696,7 +709,11 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); adapter_vk->device_limits = properties2.properties.limits; - adapter_vk_init_driver_info(adapter, &properties2.properties); + VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &memory_properties)); + + adapter_vk_init_driver_info(adapter, &properties2.properties, &memory_properties); + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid));

1 0

Józef Kucia : wined3d: Store texture swizzle capability in struct wined3d_d3d_info.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 446a2422a97bd6b35d840373be22b6289047d2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=446a2422a97bd6b35d840373… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 11:03:38 2019 +0200 wined3d: Store texture swizzle capability in struct wined3d_d3d_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/cs.c | 3 +-- dlls/wined3d/shader.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 866cfec..1555ba4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3729,6 +3729,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; + d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 0d5e2f5..87a1112 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -729,6 +729,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->shader_backend = &none_shader_backend; adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; + adapter->d3d_info.texture_swizzle = TRUE; return TRUE; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9960d06..b2a2b1a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1348,7 +1348,6 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_cs_set_texture *op = data; struct wined3d_texture *prev; @@ -1369,7 +1368,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) if (!prev || wined3d_texture_gl(op->texture)->target != wined3d_texture_gl(prev)->target || (!is_same_fixup(new_format->color_fixup, old_format->color_fixup) - && !(can_use_texture_swizzle(gl_info, new_format) && can_use_texture_swizzle(gl_info, old_format))) + && !(can_use_texture_swizzle(d3d_info, new_format) && can_use_texture_swizzle(d3d_info, old_format))) || (new_fmt_flags & WINED3DFMT_FLAG_SHADOW) != (old_fmt_flags & WINED3DFMT_FLAG_SHADOW)) device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ebfd4d..609b574 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4025,7 +4025,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->color_fixup[i] = COLOR_FIXUP_IDENTITY; continue; } - if (can_use_texture_swizzle(gl_info, texture->resource.format)) + if (can_use_texture_swizzle(d3d_info, texture->resource.format)) args->color_fixup[i] = COLOR_FIXUP_IDENTITY; else args->color_fixup[i] = texture->resource.format->color_fixup; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9494920..664f8a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1037,7 +1037,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); } - if (!is_identity_fixup(fixup) && can_use_texture_swizzle(gl_info, format)) + if (!is_identity_fixup(fixup) && can_use_texture_swizzle(context->d3d_info, format)) { GLint swizzle[4]; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e54eec2..2ec3546 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5988,7 +5988,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d if ((texture = state->textures[i])) { - if (can_use_texture_swizzle(gl_info, texture->resource.format)) + if (can_use_texture_swizzle(d3d_info, texture->resource.format)) settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; else settings->op[i].color_fixup = texture->resource.format->color_fixup; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0cfadf7..ec9df71 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -226,7 +226,7 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); } - else if (!is_identity_fixup(view_format->color_fixup) && can_use_texture_swizzle(gl_info, view_format)) + else if (!is_identity_fixup(view_format->color_fixup) && can_use_texture_swizzle(context->d3d_info, view_format)) { GLint swizzle[4]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 221ca6e..875c33b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -209,6 +209,7 @@ struct wined3d_d3d_info unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; unsigned int vertex_bgra : 1; + unsigned int texture_swizzle : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; @@ -4739,10 +4740,9 @@ static inline GLuint wined3d_texture_gl_get_texture_name(const struct wined3d_te ? texture_gl->texture_srgb.name : texture_gl->texture_rgb.name; } -static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) +static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_info, const struct wined3d_format *format) { - return gl_info->supported[ARB_TEXTURE_SWIZZLE] && !is_complex_fixup(format->color_fixup) - && !is_scaling_fixup(format->color_fixup); + return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup); } static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info)

1 0

Henri Verbeet : wined3d: Get rid of the "target" parameter to wined3d_adapter_gl_create_context().
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 11b7e47598b4bf6caa99c0dd3666b07f1b82ddd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11b7e47598b4bf6caa99c0dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 6 21:34:29 2019 +0430 wined3d: Get rid of the "target" parameter to wined3d_adapter_gl_create_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 3 +-- dlls/wined3d/context.c | 16 ++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a5fd891..da53edd 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -288,8 +288,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) heap_free(device_vk); } -static BOOL adapter_vk_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +static BOOL adapter_vk_create_context(struct wined3d_context *context, const struct wined3d_format *ds_format) { return TRUE; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a4f4be5..30686f5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1967,12 +1967,11 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *ds_format) { - struct wined3d_texture *target = swapchain->front_buffer; struct wined3d_device *device = swapchain->device; struct wined3d_context_gl *context_gl; struct wined3d_context *context; - TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); + TRACE("swapchain %p.\n", swapchain); wined3d_from_cs(device->cs); @@ -1985,7 +1984,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, cons heap_free(context_gl); return NULL; } - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + if (!(device->adapter->adapter_ops->adapter_create_context(context, ds_format))) { wined3d_release_dc(context->win_handle, context->hdc); heap_free(context_gl); @@ -2004,13 +2003,13 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, cons return context; } -BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, const struct wined3d_format *ds_format) { struct wined3d_device *device = context->device; const struct wined3d_format *color_format; const struct wined3d_d3d_info *d3d_info; const struct wined3d_gl_info *gl_info; + struct wined3d_resource *target; unsigned int target_bind_flags; BOOL aux_buffers = FALSE; HGLRC ctx, share_ctx; @@ -2057,8 +2056,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, sizeof(*context->texture_type)))) return FALSE; - color_format = target->resource.format; - target_bind_flags = target->resource.bind_flags; + target = &context->current_rt.texture->resource; + color_format = target->format; + target_bind_flags = target->bind_flags; /* In case of ORM_BACKBUFFER, make sure to request an alpha component for * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ @@ -2141,7 +2141,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, } } - context->render_offscreen = wined3d_resource_is_offscreen(&target->resource); + context->render_offscreen = wined3d_resource_is_offscreen(target); context->draw_buffers_mask = context_generate_rt_mask(GL_BACK); context->valid = 1; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b8c151d..c909e51 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2256,7 +2256,7 @@ static void adapter_no3d_destroy_device(struct wined3d_device *device) } static BOOL wined3d_adapter_no3d_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) + const struct wined3d_format *ds_format) { return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02177a9..fbcda94 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2711,8 +2711,7 @@ struct wined3d_adapter_ops BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device); void (*adapter_destroy_device)(struct wined3d_device *device); - BOOL (*adapter_create_context)(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format); + BOOL (*adapter_create_context)(struct wined3d_context *context, const struct wined3d_format *ds_format); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); BOOL (*adapter_check_format)(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, @@ -2767,9 +2766,10 @@ static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const st return CONTAINING_RECORD(adapter, struct wined3d_adapter_gl, a); } -struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; +struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, - struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; + const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; struct wined3d_adapter_vk {

1 0

Józef Kucia : d3d11: Set more format support flags.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 995139bce8487af3969dd9f6a25aca9f2a7116e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=995139bce8487af3969dd9f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat May 4 13:00:35 2019 +0200 d3d11: Set more format support flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47096 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4f19c03..aaa525d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3344,6 +3344,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * } wined3d_mutex_unlock(); + if (*format_support & (D3D11_FORMAT_SUPPORT_TEXTURE1D + | D3D11_FORMAT_SUPPORT_TEXTURE2D | D3D11_FORMAT_SUPPORT_TEXTURE3D)) + { + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; + + if (*format_support & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) + { + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; + } + } + return S_OK; }

1 0

Andrew Eikum : winebus.sys: Remove some magic numbers.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: e529387f67569cfa877c2185341b5cdff0e0bf39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e529387f67569cfa877c2185… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:46:07 2019 -0500 winebus.sys: Remove some magic numbers. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 724cd78..4cbf561 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -149,15 +149,17 @@ static const BYTE REPORT_AXIS_TAIL[] = { }; #define IDX_ABS_AXIS_COUNT 23 +#define CONTROLLER_NUM_BUTTONS 15 + static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ 0x19, 0x01, /* USAGE_MINIMUM (Button 1) */ - 0x29, 0x0f, /* USAGE_MAXIMUM (Button 15) */ + 0x29, CONTROLLER_NUM_BUTTONS, /* USAGE_MAXIMUM (Button 15) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x95, 0x0f, /* REPORT_COUNT (15) */ + 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (15) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ /* padding */ @@ -194,6 +196,8 @@ static const BYTE CONTROLLER_TRIGGERS [] = { 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; +#define CONTROLLER_NUM_AXES 6 + static const BYTE HAPTIC_RUMBLE[] = { 0x06, 0x00, 0xff, /* USAGE PAGE (vendor-defined) */ 0x09, 0x01, /* USAGE (1) */ @@ -246,7 +250,7 @@ static BYTE *add_axis_block(BYTE *report_ptr, BYTE count, BYTE page, const BYTE static void set_axis_value(struct platform_private *ext, int index, short value) { int offset; - offset = ext->axis_start + index * 2; + offset = ext->axis_start + index * sizeof(WORD); switch (index) { @@ -266,7 +270,7 @@ static void set_axis_value(struct platform_private *ext, int index, short value) static void set_ball_value(struct platform_private *ext, int index, int value1, int value2) { int offset; - offset = ext->ball_start + (index * 2); + offset = ext->ball_start + (index * sizeof(WORD)); if (value1 > 127) value1 = 127; if (value1 < -127) value1 = -127; if (value2 > 127) value2 = 127; @@ -381,7 +385,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * axis_count); descript_size += sizeof(REPORT_AXIS_TAIL); - report_size += (2 * axis_count); + report_size += (sizeof(WORD) * axis_count); } ball_count = pSDL_JoystickNumBalls(ext->sdl_joystick); @@ -396,7 +400,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) descript_size += sizeof(REPORT_AXIS_HEADER); descript_size += (sizeof(REPORT_AXIS_USAGE) * ball_count * 2); descript_size += sizeof(REPORT_REL_AXIS_TAIL); - report_size += (2*ball_count); + report_size += (sizeof(WORD) * ball_count); } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); @@ -404,8 +408,7 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (hat_count) { descript_size += sizeof(REPORT_HATSWITCH); - for (i = 0; i < hat_count; i++) - report_size++; + report_size += hat_count; } descript_size += test_haptic(ext); @@ -482,8 +485,8 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) descript_size += sizeof(CONTROLLER_TRIGGERS); descript_size += test_haptic(ext); - ext->axis_start = 2; - ext->buffer_length = 14; + ext->axis_start = (CONTROLLER_NUM_BUTTONS + 7) / 8; + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD); TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length);

1 0

Henri Verbeet : wined3d: Get rid of the "target" parameter to context_create().
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 186ae1ad7863a67871babba24586a1e2ca48c0f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186ae1ad7863a67871babba2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 6 21:34:27 2019 +0430 wined3d: Get rid of the "target" parameter to context_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7e7ab09..3b1832f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1966,9 +1966,9 @@ static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d return TRUE; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, - struct wined3d_texture *target, const struct wined3d_format *ds_format) +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *ds_format) { + struct wined3d_texture *target = swapchain->front_buffer; struct wined3d_device *device = swapchain->device; struct wined3d_context_gl *context_gl; struct wined3d_context *context; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4ac091f..7210682 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -739,7 +739,7 @@ static void wined3d_swapchain_cs_init(void *object) for (i = 0; i < ARRAY_SIZE(formats); ++i) { swapchain->ds_format = wined3d_get_format(adapter, formats[i], WINED3D_BIND_DEPTH_STENCIL); - if ((swapchain->context[0] = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) + if ((swapchain->context[0] = context_create(swapchain, swapchain->ds_format))) break; TRACE("Depth stencil format %s is not supported, trying next format.\n", debug_d3dformat(formats[i])); } @@ -1085,7 +1085,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId()); - if (!(ctx = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format))) + if (!(ctx = context_create(swapchain, swapchain->ds_format))) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e698c79..02177a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2196,7 +2196,7 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of context_validate_onscreen_formats().
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: b6dc97179617d2a5216eddc410779c1ed9eb5965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6dc97179617d2a5216eddc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 6 21:34:30 2019 +0430 wined3d: Get rid of context_validate_onscreen_formats(). This was used when using the onscreen depth/stencil buffer with FBOs. We no longer do that. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 30686f5..0defbcc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2683,47 +2683,6 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context->render_offscreen = offscreen; } -static BOOL match_depth_stencil_format(const struct wined3d_format *existing, - const struct wined3d_format *required) -{ - if (existing == required) - return TRUE; - if ((existing->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - != (required->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) - return FALSE; - if (existing->depth_size < required->depth_size) - return FALSE; - /* If stencil bits are used the exact amount is required - otherwise - * wrapping won't work correctly. */ - if (required->stencil_size && required->stencil_size != existing->stencil_size) - return FALSE; - return TRUE; -} - -/* Context activation is done by the caller. */ -static void context_validate_onscreen_formats(struct wined3d_context *context, - const struct wined3d_rendertarget_view *depth_stencil) -{ - /* Onscreen surfaces are always in a swapchain */ - struct wined3d_swapchain *swapchain = context->current_rt.texture->swapchain; - - if (context->render_offscreen || !depth_stencil) return; - if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->format)) return; - - /* TODO: If the requested format would satisfy the needs of the existing one(reverse match), - * or no onscreen depth buffer was created, the OpenGL drawable could be changed to the new - * format. */ - WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); - - /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ - if (!(wined3d_texture_load_location(context->current_rt.texture, context->current_rt.sub_resource_idx, - context, WINED3D_LOCATION_TEXTURE_RGB))) - ERR("Failed to load location.\n"); - swapchain->render_to_fbo = TRUE; - swapchain_update_draw_bindings(swapchain); - context_set_render_offscreen(context, TRUE); -} - GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) { switch (wined3d_settings.offscreen_rendering_mode) @@ -3031,8 +2990,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { struct wined3d_rendertarget_info ds_info = {{0}}; - context_validate_onscreen_formats(context, dsv); - if (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource)) { memset(context->blit_targets, 0, sizeof(context->blit_targets)); @@ -3946,11 +3903,6 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, context_set_render_offscreen(context, TRUE); } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) - { - context_validate_onscreen_formats(context, fb->depth_stencil); - } - /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */

1 0