wine-devel March 2020

wine-devel@winehq.org

72 participants
969 discussions

[PATCH 2/7] dbghelp: Move alternate file map pointer to generic image_file_map.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 61 ++++++++++++++++++++++++------------ dlls/dbghelp/image_private.h | 27 +++++++++++----- dlls/dbghelp/macho_module.c | 1 + dlls/dbghelp/pe_module.c | 1 + 4 files changed, 63 insertions(+), 27 deletions(-)

1 0

[PATCH 1/7] dbghelp: Use generic image_find_section in elf_check_alternate.
by Jacek Caban 16 Mar '20

16 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] dxgi/tests: Avoid an ever chaning value in a dxgi failure message.
by Francois Gouget 16 Mar '20

16 Mar '20

The test does not trace any window handle so there is no value to correlate the value in the failure message with. So showing this ever changing value is useless as is. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e2b5df7b272..16482ae12ee 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5060,8 +5060,8 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { - ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#lx, lparam %#lx.\n", - message, hwnd, wparam, lparam); + ok(!expect_no_messages, "Got unexpected message %#x, wparam %#lx, lparam %#lx.\n", + message, wparam, lparam); if (expect_messages) { -- 2.20.1

4 4

[PATCH 5/5] d3d9: Report d3d9 adapter group information in device caps.
by Zhiyi Zhang 16 Mar '20

16 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/d3d9_private.h | 19 +++++++++-------- dlls/d3d9/device.c | 46 +++++++++++++++++++++++++++++++++------- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 4 ---- include/wine/wined3d.h | 4 ---- 5 files changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a0daaf42880..7f0901805b0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -52,15 +52,6 @@ extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; -HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; -D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; -enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; -unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; -void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, - const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; - struct d3d9 { IDirect3D9Ex IDirect3D9Ex_iface; @@ -71,6 +62,16 @@ struct d3d9 BOOL extended; }; +HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; +D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; +BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; +enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; +unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; +void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps, + const struct d3d9 *d3d9, unsigned int adapter_ordinal) DECLSPEC_HIDDEN; + BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DECLSPEC_HIDDEN; struct fvf_declaration diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b4887dff450..393069d6b9e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -360,7 +360,8 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) +void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps, + const struct d3d9 *d3d9, unsigned int adapter_ordinal) { static const DWORD ps_minor_version[] = {0, 4, 0, 0}; static const DWORD vs_minor_version[] = {0, 1, 0, 0}; @@ -370,9 +371,12 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD| D3DPTFILTERCAPS_MAGFGAUSSIANQUAD; + struct wined3d_output *wined3d_output, *master_output; + struct wined3d_adapter *wined3d_adapter; + unsigned int output_idx, output_count; caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -426,9 +430,6 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d caps->PixelShader1xMaxValue = wined3d_caps->PixelShader1xMaxValue; caps->DevCaps2 = wined3d_caps->DevCaps2; caps->MaxNpatchTessellationLevel = wined3d_caps->MaxNpatchTessellationLevel; - caps->MasterAdapterOrdinal = wined3d_caps->MasterAdapterOrdinal; - caps->AdapterOrdinalInGroup = wined3d_caps->AdapterOrdinalInGroup; - caps->NumberOfAdaptersInGroup = wined3d_caps->NumberOfAdaptersInGroup; caps->DeclTypes = wined3d_caps->DeclTypes; caps->NumSimultaneousRTs = wined3d_caps->NumSimultaneousRTs; caps->StretchRectFilterCaps = wined3d_caps->StretchRectFilterCaps; @@ -520,6 +521,33 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d DWORD major = caps->VertexShaderVersion; caps->VertexShaderVersion = D3DVS_VERSION(major, vs_minor_version[major]); } + + /* Get adapter group information */ + output_idx = adapter_ordinal; + wined3d_output = d3d9->wined3d_outputs[output_idx]; + wined3d_adapter = wined3d_output_get_adapter(wined3d_output); + + master_output = wined3d_adapter_get_output(wined3d_adapter, 0); + for (output_idx = 0; output_idx < d3d9->wined3d_output_count; ++output_idx) + { + if (master_output == d3d9->wined3d_outputs[output_idx]) + { + caps->MasterAdapterOrdinal = output_idx; + break; + } + } + + output_count = wined3d_adapter_get_output_count(wined3d_adapter); + for (output_idx = 0; output_idx < output_count; ++output_idx) + { + if (wined3d_output == wined3d_adapter_get_output(wined3d_adapter, output_idx)) + { + caps->AdapterOrdinalInGroup = output_idx; + break; + } + } + + caps->NumberOfAdaptersInGroup = caps->AdapterOrdinalInGroup ? 0 : output_count; } static void device_reset_viewport_state(struct d3d9_device *device) @@ -709,7 +737,7 @@ static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCA hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, device->d3d_parent, device->adapter_ordinal); return hr; } @@ -4592,9 +4620,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine struct wined3d_swapchain_desc *swapchain_desc; struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; - struct wined3d_caps caps; + struct wined3d_caps wined3d_caps; unsigned int output_idx; unsigned i, count = 1; + D3DCAPS9 caps; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -4633,7 +4662,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d_adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + d3dcaps_from_wined3dcaps(&caps, &wined3d_caps, parent, adapter); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index d79b32515fa..3d4e2392719 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -439,7 +439,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, d3d9, adapter); return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8cf0d77e821..2fefb20a3e3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1889,7 +1889,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | @@ -2079,9 +2078,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET | WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; caps->MaxNpatchTessellationLevel = 0; - caps->MasterAdapterOrdinal = 0; - caps->AdapterOrdinalInGroup = 0; - caps->NumberOfAdaptersInGroup = 1; caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index affeb891e75..c0a03e41f8f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1911,7 +1911,6 @@ struct wined3d_ddraw_caps struct wined3d_caps { enum wined3d_device_type DeviceType; - UINT AdapterOrdinal; DWORD Caps; DWORD Caps2; @@ -1979,9 +1978,6 @@ struct wined3d_caps float MaxNpatchTessellationLevel; - UINT MasterAdapterOrdinal; - UINT AdapterOrdinalInGroup; - UINT NumberOfAdaptersInGroup; DWORD DeclTypes; DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; -- 2.20.1

2 3

[PATCH 2/5] d3d8/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 16 Mar '20

16 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 224 +++++++++++++++++++++------------------ 1 file changed, 122 insertions(+), 102 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 008395df1a6..367be57d5ec 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -106,7 +106,8 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } -static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, const struct device_desc *desc) +static IDirect3DDevice8 *create_device_on_adapter(IDirect3D8 *d3d8, unsigned int adapter_idx, + HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice8 *device; @@ -135,12 +136,12 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons behavior_flags |= D3DCREATE_FPU_PRESERVE; } - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; @@ -148,13 +149,18 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); - if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, adapter_idx, D3DDEVTYPE_HAL, focus_window, behavior_flags, &present_parameters, &device))) return device; return NULL; } +static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, const struct device_desc *desc) +{ + return create_device_on_adapter(d3d8, D3DADAPTER_DEFAULT, focus_window, desc); +} + static HRESULT reset_device(IDirect3DDevice8 *device, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -8829,6 +8835,7 @@ static void test_swapchain_multisample_reset(void) static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; IDirect3DDevice8 *device; IDirect3D8 *d3d; ULONG refcount; @@ -8839,106 +8846,119 @@ static void test_device_caps(void) window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D8_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D8_GetDeviceCaps */ + hr = IDirect3D8_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "GetDeviceCaps failed, hr %#x.\n", hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("No Direct3D support, skipping test.\n"); + break; + } + ok(caps.AdapterOrdinal == adapter_idx, "Expect adapter ordinal %u, got %u.\n", adapter_idx, + caps.AdapterOrdinal); + + /* Test IDirect3DDevice8_GetDeviceCaps */ + device = create_device_on_adapter(d3d, adapter_idx, window, NULL); + ok(!!device, "Failed to create a D3D device on adapter %u.\n", adapter_idx); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + ok(caps.AdapterOrdinal == adapter_idx, "Expect adapter ordinal %u, got %u.\n", adapter_idx, + caps.AdapterOrdinal); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), + "Caps2 field has unexpected flags %#x.\n", caps.Caps2); + /* Nvidia returns that 0x400 flag, which is probably Vista+ + * D3DCAPS3_DXVAHD from d3d9caps.h */ + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) + || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), + "Caps3 field has unexpected flags %#x.\n", caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE)) + || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), + "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); + /* AMD includes an unknown 0x2 flag. */ + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) + || broken(!(caps.RasterCaps & ~0x0ff7f19b)), + "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA)), + "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), + "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) + || broken(!(caps.TextureFilterCaps & ~0x0703073f)), + "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC + | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), + "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), + "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), + "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), + "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_CANRENDERWINDOWED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_RESERVED)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* Nvidia returns that 0x400 flag, which is probably Vista+ - * D3DCAPS3_DXVAHD from d3d9caps.h */ - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | D3DCAPS3_RESERVED | 0x400)) - || broken(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | 0x80))), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE)) - || broken(!(caps.PrimitiveMiscCaps & ~0x003fdff6)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - /* AMD includes an unknown 0x2 flag. */ - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_PAT | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_ANTIALIASEDGES - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE)) - || broken(!(caps.RasterCaps & ~0x0ff7f19b)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA)), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)) - || broken(!(caps.TextureFilterCaps & ~0x0703073f)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC - | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_NO_VSDT_UBYTE4)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D8_Release(d3d); DestroyWindow(window); } -- 2.20.1

2 3

[PATCH 1/4] wined3d: Fix an accidental replacement of STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE).
by Zebediah Figura 16 Mar '20

16 Mar '20

Fixes: 04453496a22d4b9a8f4ff50e48166b4928b937f5 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Thanks to Matteo Bruni for spotting this one. dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e4f174b9f1..0761dd6379 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4471,7 +4471,7 @@ static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_g /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_BLEND); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not -- 2.25.1

2 7

[PATCH 1/2] ddraw/tests: Re-init for every test_surface_discard iteration.
by Stefan Dösinger 16 Mar '20

16 Mar '20

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 39 +++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw2.c | 39 +++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 41 ++++++++++++++++++++++++--------------- dlls/ddraw/tests/ddraw7.c | 41 ++++++++++++++++++++++++--------------- 4 files changed, 98 insertions(+), 62 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 98b83334122..5bfca430086 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4413,23 +4413,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - ddraw = create_ddraw(); - ok(!!ddraw, "Failed to create a ddraw object.\n"); - if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - IDirectDraw_Release(ddraw); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); i++) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void**)&target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -4475,11 +4483,12 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, never changes the pointer. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface_Release(target); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); } - IDirectDrawSurface_Release(target); - IDirect3DDevice_Release(device); - IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7dfb35d2d3a..b472b3d5883 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4943,23 +4943,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - ddraw = create_ddraw(); - ok(!!ddraw, "Failed to create a ddraw object.\n"); - if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - IDirectDraw2_Release(ddraw); - return; - } - - hr = IDirect3DDevice2_GetRenderTarget(device, &target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); i++) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return; + } + + hr = IDirect3DDevice2_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -5005,11 +5013,12 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, never changes the pointer. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface_Release(target); + IDirect3DDevice2_Release(device); + IDirectDraw2_Release(ddraw); } - IDirectDrawSurface_Release(target); - IDirect3DDevice2_Release(device); - IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index e1d5bac18bb..1e6cf4c446a 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6565,23 +6565,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice3_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); - hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); - hr = IDirect3DDevice3_GetRenderTarget(device, &target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); i++) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -6624,12 +6632,13 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, does not. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface4_Release(target); + IDirectDraw4_Release(ddraw); + IDirect3D3_Release(d3d); + IDirect3DDevice3_Release(device); } - IDirectDrawSurface4_Release(target); - IDirectDraw4_Release(ddraw); - IDirect3D3_Release(d3d); - IDirect3DDevice3_Release(device); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 3ad44991863..bdec30621e3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6379,23 +6379,31 @@ static void test_surface_discard(void) unsigned int i; window = create_window(); - if (!(device = create_device(window, DDSCL_NORMAL))) - { - skip("Failed to create a 3D device, skipping test.\n"); - DestroyWindow(window); - return; - } - hr = IDirect3DDevice7_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); - hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); - ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); - hr = IDirect3DDevice7_GetRenderTarget(device, &target); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { BOOL discarded; + /* Sigh. Anything other than the first run of the loop randomly fails with + * DDERR_SURFACELOST on my Radeon Pro 560 on Win10 19.09. Most of the time + * the blit fails, but with sleeps added between surface creation and lock + * the lock can fail too. Interestingly ddraw claims the render target has + * been lost, not the test surface. + * + * Recreating ddraw every iteration seems to fix this. */ + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &target); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; @@ -6438,12 +6446,13 @@ static void test_surface_discard(void) /* Windows 7 reliably changes the address of surfaces that are discardable (Nvidia Kepler, * AMD r500, evergreen). Windows XP, at least on AMD r200, does not. */ ok(!discarded || tests[i].discard, "Expected surface not to be discarded, case %u\n", i); + + IDirectDrawSurface7_Release(target); + IDirectDraw7_Release(ddraw); + IDirect3D7_Release(d3d); + IDirect3DDevice7_Release(device); } - IDirectDrawSurface7_Release(target); - IDirectDraw7_Release(ddraw); - IDirect3D7_Release(d3d); - IDirect3DDevice7_Release(device); DestroyWindow(window); } -- 2.24.1

3 4

[PATCH 3/5] d3d8: Report d3d8 adapter ordinal in device caps.
by Zhiyi Zhang 16 Mar '20

16 Mar '20

d3d8 adapters are actually outputs in wined3d. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 4 +++- dlls/d3d8/device.c | 8 +++++--- dlls/d3d8/directx.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 488035c7f82..93526411767 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -51,7 +51,8 @@ extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; +void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, + unsigned int adapter_ordinal) DECLSPEC_HIDDEN; struct d3d8 { @@ -113,6 +114,7 @@ struct d3d8_device struct wined3d_device_parent device_parent; LONG ref; struct wined3d_device *wined3d_device; + unsigned int adapter_ordinal; IDirect3D8 *d3d_parent; struct d3d8_handle_table handle_table; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4b7c03e4e42..400e1e292ab 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -310,10 +310,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) +void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps, + unsigned int adapter_ordinal) { caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -689,7 +690,7 @@ static HRESULT WINAPI d3d8_device_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, device->adapter_ordinal); return hr; } @@ -3678,6 +3679,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->IDirect3DDevice8_iface.lpVtbl = &d3d8_device_vtbl; device->device_parent.ops = &d3d8_wined3d_device_parent_ops; + device->adapter_ordinal = adapter; device->ref = 1; if (!(device->handle_table.entries = heap_alloc_zero(D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)))) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 66e7e622f8f..343073f3515 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -389,7 +389,7 @@ static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEV hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3dcaps_from_wined3dcaps(caps, &wined3d_caps, adapter); return hr; } -- 2.20.1

2 1

[PATCH 1/5] wined3d: Pass a struct wined3d_adapter pointer to wined3d_get_device_caps().
by Zhiyi Zhang 16 Mar '20

16 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 9 ++++++++- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 9 ++++++++- dlls/ddraw/ddraw.c | 4 ++-- dlls/dxgi/adapter.c | 4 +--- dlls/wined3d/device.c | 3 +-- dlls/wined3d/directx.c | 13 ++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 02b010c22a4..4b7c03e4e42 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3701,7 +3701,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index cbb638f014d..66e7e622f8f 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -370,16 +370,23 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS8 *caps) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); + struct wined3d_adapter *wined3d_adapter; struct wined3d_caps wined3d_caps; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!caps) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_get_device_caps(d3d8->wined3d, adapter, device_type, &wined3d_caps); + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); + hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ec1d18a79fe..b4887dff450 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4633,7 +4633,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6c8ca1c3d3d..d79b32515fa 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -418,18 +418,25 @@ static HRESULT WINAPI d3d9_CheckDeviceFormatConversion(IDirect3D9Ex *iface, UINT static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DDEVTYPE device_type, D3DCAPS9 *caps) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + struct wined3d_adapter *wined3d_adapter; struct wined3d_caps wined3d_caps; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, adapter, device_type, caps); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (!caps) return D3DERR_INVALIDCALL; memset(caps, 0, sizeof(*caps)); wined3d_mutex_lock(); - hr = wined3d_get_device_caps(d3d9->wined3d, adapter, device_type, &wined3d_caps); + wined3d_adapter = wined3d_output_get_adapter(d3d9->wined3d_outputs[output_idx]); + hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e82f9644e3b..de457511591 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1227,7 +1227,7 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) memset(&wined3d_caps, 0, sizeof(wined3d_caps)); wined3d_mutex_lock(); - hr = wined3d_get_device_caps(ddraw->wined3d, 0, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); + hr = wined3d_get_device_caps(ddraw->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &wined3d_caps); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -5017,7 +5017,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de return E_FAIL; } - if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, &caps))) + if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d_adapter, device_type, &caps))) { ERR("Failed to get device caps, hr %#x.\n", hr); wined3d_decref(ddraw->wined3d); diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 2bd69954e10..d48d4755d00 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -211,7 +211,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; struct wined3d_caps caps; - struct wined3d *wined3d; HRESULT hr; TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); @@ -230,8 +229,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda adapter_id.device_name_size = 0; wined3d_mutex_lock(); - wined3d = adapter->factory->wined3d; - hr = wined3d_get_device_caps(wined3d, adapter->ordinal, WINED3D_DEVICE_TYPE_HAL, &caps); + hr = wined3d_get_device_caps(adapter->wined3d_adapter, WINED3D_DEVICE_TYPE_HAL, &caps); if (SUCCEEDED(hr)) hr = wined3d_adapter_get_identifier(adapter->wined3d_adapter, 0, &adapter_id); wined3d_mutex_unlock(); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d94b1e2f2da..60a6d9eb1c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3788,8 +3788,7 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device { TRACE("device %p, caps %p.\n", device, caps); - return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, - device->create_parms.device_type, caps); + return wined3d_get_device_caps(device->adapter, device->create_parms.device_type, caps); } HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f8933801a9..8cf0d77e821 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1874,27 +1874,22 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, return WINED3D_OK; } -HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps) { const struct wined3d_d3d_info *d3d_info; struct wined3d_vertex_caps vertex_caps; - const struct wined3d_adapter *adapter; DWORD ckey_caps, blit_caps, fx_caps; struct fragment_caps fragment_caps; struct shader_caps shader_caps; - TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); + TRACE("adapter %p, device_type %s, caps %p.\n", + adapter, debug_d3ddevicetype(device_type), caps); - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = wined3d->adapters[adapter_idx]; d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter_idx; + caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a25accc2371..c06cca22ee4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -11,7 +11,7 @@ @ cdecl wined3d_decref(ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) -@ cdecl wined3d_get_device_caps(ptr long long ptr) +@ cdecl wined3d_get_device_caps(ptr long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ec097ea5fb..affeb891e75 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2276,7 +2276,7 @@ ULONG __cdecl wined3d_decref(struct wined3d *wined3d); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, unsigned int idx); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); -HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, +HRESULT __cdecl wined3d_get_device_caps(const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, struct wined3d_caps *caps); HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_output_desc *desc); -- 2.20.1

2 1

[PATCH] mf: Remove FIXME for zero buffer size, it's used as is.
by Nikolay Sivov 16 Mar '20

16 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index e98be7c95f..07cfc4ee8c 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2257,9 +2257,6 @@ static HRESULT transform_node_get_sample(struct topo_node *node, DWORD output, I { IMFMediaBuffer *buffer = NULL; - if (!stream_info.cbSize) - FIXME("Unhandled buffer size %u.\n", stream_info.cbSize); - hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer); if (SUCCEEDED(hr)) hr = MFCreateSample(&buffers[output].pSample); -- 2.25.1

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
97
Older →

Jump to page:

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-devel March 2020