March 2019 - Wine-commits - list.winehq.org

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetFloatArray() helper.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 86dff681fc6c36a77b84ec7ded4dfc3f889e2882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86dff681fc6c36a77b84ec7d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 00:13:55 2019 +0100 d3dx9: Merge the d3dx_effect_SetFloatArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 69 ++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 47bb6b7..230af5b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1488,44 +1488,6 @@ static HRESULT d3dx9_base_effect_get_int_array(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const float *f, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param) - { - UINT i, size = min(count, param->bytes / sizeof(DWORD)); - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - case D3DXPC_MATRIX_ROWS: - for (i = 0; i < size; ++i) - { - set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); - } - set_dirty(param); - return D3D_OK; - - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -3530,10 +3492,39 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p const float *f, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); - return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count); + if (param) + { + unsigned int i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); + set_dirty(param); + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count)

1 0

Nikolay Sivov : winex11: Fix typo in comments.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: e03114c75b1c072204b95db3b727ed160c3559b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e03114c75b1c072204b95db3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 16:18:18 2019 +0300 winex11: Fix typo in comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 2f90f853..dfeed2c 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -183,8 +183,8 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len) { - /* we need to make sure the CompStr, CompClaus and CompAttr fields are all - * set and correct */ + /* We need to make sure the CompStr, CompClause and CompAttr fields are all + * set and correct. */ int needed_size; HIMCC rc; LPBYTE newdata = NULL;

1 0

Nikolay Sivov : winemac: Fix typo in comments.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 702c73626a7aee5400ec57e6a06cd7124951072f URL: https://source.winehq.org/git/wine.git/?a=commit;h=702c73626a7aee5400ec57e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 8 16:18:32 2019 +0300 winemac: Fix typo in comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 00fb236..4d95275 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -144,8 +144,8 @@ static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, static HIMCC updateCompStr(HIMCC old, LPCWSTR compstr, DWORD len, DWORD *flags) { - /* we need to make sure the CompStr, CompClaus and CompAttr fields are all - * set and correct */ + /* We need to make sure the CompStr, CompClause and CompAttr fields are all + * set and correct. */ int needed_size; HIMCC rc; LPBYTE newdata = NULL;

1 0

Michael Stefaniuc : shell32: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 390814202852bc6c6db0e39c42ee6abd3121805a URL: https://source.winehq.org/git/wine.git/?a=commit;h=390814202852bc6c6db0e39c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:52 2019 +0100 shell32: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 0d80e63..49e7f5d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -431,8 +431,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH return S_OK; failed: - if (list) - IEnumIDList_Release(&list->IEnumIDList_iface); + IEnumIDList_Release(&list->IEnumIDList_iface); for (; i<pidls_count; i++) ILFree(pidls[i]); SHFree(pidls);

1 0

Michael Stefaniuc : wininet: Remove redundant not-NULL check (coccinellery ).
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 73e5347739ee2043be641159aa34cc2079773794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73e5347739ee2043be641159… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:50 2019 +0100 wininet: Remove redundant not-NULL check (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index e12e494..ec94f85 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2581,8 +2581,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, lerror: if (!bSuccess) { - if(lpwfs) - WININET_Release( &lpwfs->hdr ); + WININET_Release(&lpwfs->hdr); return NULL; }

1 0

Michael Stefaniuc : winefile: Remove useless cast to self.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: d9c99ac44c6e412e0a1d2c4410e9945649b1efc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9c99ac44c6e412e0a1d2c44… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 8 21:16:54 2019 +0100 winefile: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winefile/winefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 23be450..2f4eb2a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -739,7 +739,7 @@ static HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) { IExtractIconW* pExtract; - if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, (LPCITEMIDLIST*)&pidl, &IID_IExtractIconW, 0, (LPVOID*)&pExtract))) { + if (SUCCEEDED(IShellFolder_GetUIObjectOf(folder, 0, 1, &pidl, &IID_IExtractIconW, 0, (void**)&pExtract))) { WCHAR path[_MAX_PATH]; unsigned flags; HICON hicon;

1 0

Zebediah Figura : quartz/tests: Add some tests for querying ACM wrapper pin information.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 865f471a646c067e8ad71fe9bd3b96c501347216 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865f471a646c067e8ad71fe9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 8 00:02:05 2019 -0600 quartz/tests: Add some tests for querying ACM wrapper pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index e356b6c..571e78d9 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -251,6 +251,81 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_acm_wrapper(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); +todo_wine + ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); +todo_wine + ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(acmwrapper) { CoInitialize(NULL); @@ -258,6 +333,7 @@ START_TEST(acmwrapper) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Daniel Ansorregui : d3d9/tests: Add a basic Fetch4 sampling test.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 46a67699494edbdd5d06b51f62599c2cc54a5483 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a67699494edbdd5d06b51f… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Wed Mar 6 16:48:12 2019 +0330 d3d9/tests: Add a basic Fetch4 sampling test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 275 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 275 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46a67699494edbdd5d06…

1 0

Daniel Ansorregui : d3d9/tests: Add texldd/texldb/ texldl Fetch4 sampling tests.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: 92cb6242ec9e2c728506a4ae9bded0234636a707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92cb6242ec9e2c728506a4ae… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Wed Mar 6 16:48:13 2019 +0330 d3d9/tests: Add texldd/texldb/texldl Fetch4 sampling tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index adb04c1..c62a94a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15443,6 +15443,44 @@ static void test_fetch4(void) 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ 0x0000ffff, /* end */ }; + /* Fetch4 uses the same D3D state as LOD bias, and therefore disables LOD + * handling. Texldd/texldb/texldl give the same result as plain texld. */ + /* NOTE: The Radeon HD 5700 driver 8.17.10.1404 disables Fetch4 on these + * instructions. */ + static const DWORD ps_code_texldd[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, 0.5, 0.5 */ + 0x05000051, 0xa00f0001, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, /* def c0, 1.0, 1.0, 1.0, 1.0 */ + 0x02000001, 0x800f0002, 0xa0e40000, /* mov r2, c0 */ + 0x0500005d, 0x800f0000, 0x90e40000, 0xa0e40800, 0xa0e40000, 0x80e40002, /* texldd r0, v0, s0, c0, r2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_texldb[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x40a00000, 0x40a00000, /* def c0, 0.0, 0.0, 5.0, 5.0 */ + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40000, /* add r0, v0, c0 */ + 0x03020042, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldb r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; + static const DWORD ps_code_texldl[] = + { + 0xffff0300, /* ps_3_0 */ + 0x0200001f, 0x80000005, 0x900f0000, /* dcl_texcoord v0 */ + 0x0200001f, 0x90000000, 0xa00f0800, /* dcl_2d s0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x3f000000, 0x3f000000, /* def c0, 0.0, 0.0, 0.5, 0.5 */ + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40000, /* add r0, v0, c0 */ + 0x0300005f, 0x800f0000, 0x80e40000, 0xa0e40800, /* texldl r0, r0, s0 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff, /* end */ + }; static const struct { @@ -15503,6 +15541,9 @@ static void test_fetch4(void) {"texld", ps_code_texld, 0, FALSE, 0}, {"texldp", ps_code_texldp, 2, FALSE, 0}, {"texld_yzwx", ps_code_swizzle, 0, TRUE , 0}, + {"texldd", ps_code_texldd, 0, FALSE, 0}, + {"texldb", ps_code_texldb, 0, FALSE, 0}, + {"texldl", ps_code_texldl, 0, FALSE, 0}, {"FFP_proj", NULL, 2, FALSE, D3DTTFF_PROJECTED}, {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, };

1 0

Daniel Ansorregui : d3d9/tests: Add tests for Fetch4 format support.
by Alexandre Julliard 09 Mar '19

09 Mar '19

Module: wine Branch: master Commit: c4235cee1b0cd36b4e3c57a8d03c195e00a74e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4235cee1b0cd36b4e3c57a8… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Wed Mar 6 16:48:14 2019 +0330 d3d9/tests: Add tests for Fetch4 format support. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c62a94a..f6b9211 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15493,6 +15493,15 @@ static void test_fetch4(void) {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 4.0f, 2.0f}}, {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 4.0f, 2.0f}}, {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 4.0f, 2.0f}}, + }, + quad2[] = + { + /* Tilted on the z-axis to get a depth gradient in the depth test. */ + /* Note: Using 0.55f-0.6f to avoid rounding errors on depth tests. */ + {{-1.0f, 1.0f, 1.0f}, {0.0f, 0.0f, 0.6f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.6f, 0.0f}}, + {{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.6f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {1.0f, 1.0f, 0.6f, 0.0f}}, }; static const struct @@ -15548,6 +15557,67 @@ static void test_fetch4(void) {"FFP_proj3", NULL, 4, FALSE, D3DTTFF_COUNT3 | D3DTTFF_PROJECTED}, }; + static const struct + { + const char *name; + D3DFORMAT format; + DWORD data; + unsigned int x, y; + unsigned int w, h; + D3DCOLOR colour_amd[3]; + D3DCOLOR colour_intel[3]; + BOOL todo; + } + format_tests[] = + { + /* Enabled formats */ + { + "L8", D3DFMT_L8, + 0xff804010, 360, 30, 2, 2, + {0x40400000, 0x40400000, 0x10400000}, + {0x40101040, 0x40101040, 0x40101040}, + }, + { + "L16", D3DFMT_L16, + 0xff804010, 360, 30, 2, 2, + {0xffff0000, 0xffff0000, 0x40ff0000}, + {0xff4040ff, 0xff4040ff, 0xff4040ff}, + }, + { + "R16F", D3DFMT_R16F, + 0x38003c00, 360, 30, 2, 2, + {0x80800000, 0x80800000, 0xff800000}, + {0x80ffff80, 0x80ffff80, 0x80ffff80}, + }, + { + "R32F", D3DFMT_R32F, + 0x3f000000, 360, 30, 2, 2, + {0x00000000, 0x00000000, 0x80000000}, + {0x00808000, 0x00808000, 0x00808000}, + }, + { + "ATI1", MAKEFOURCC('A','T','I','1'), + 0xb97700ff, 360, 30, 4, 4, + {0x6d6d6d6d, 0x6d6d6d6d, 0x49494949}, + {0xff6d00ff, 0xff6d00ff, 0xff4900ff}, + }, + /* Unsupported on Intel, broken in Wine. */ + { + "A8", D3DFMT_A8, + 0xff804010, 360, 30, 2, 2, + {0x40400000, 0x40400000, 0x10400000}, + {0x00000000, 0x00000000, 0x00000000}, + TRUE, + }, + /* Unsupported format. */ + { + "A8R8G8B8", D3DFMT_A8R8G8B8, + 0xff804010, 360, 270, 2, 2, + {0x00000000, 0x00000000, 0xff804010}, + {0x00000000, 0x00000000, 0xff804010}, + }, + }; + D3DCOLOR colour, colour_amd, colour_intel, colour_off; IDirect3DPixelShader9 *ps[ARRAY_SIZE(shaders)]; IDirect3DSurface9 *original_rt; @@ -15695,6 +15765,58 @@ static void test_fetch4(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); } + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* Test Fetch4 format support. */ + for (i = 0; i < ARRAY_SIZE(format_tests); ++i) + { + IDirect3DTexture9 *tex; + + hr = IDirect3DDevice9_CreateTexture(device, format_tests[i].w, format_tests[i].h, + 1, 0, format_tests[i].format, D3DPOOL_MANAGED, &tex, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture9_LockRect(tex, 0, &lr, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(lr.pBits, &format_tests[i].data, 4); + hr = IDirect3DTexture9_UnlockRect(tex, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(format_tests[i].colour_amd); ++j) + { + hr = IDirect3DDevice9_SetVertexShader(device, ps[j] ? vs : NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps[j]); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(*quad2)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(original_rt, &rb); + colour_amd = format_tests[i].colour_amd[j]; + colour_intel = format_tests[i].colour_intel[j]; + colour = get_readback_color(&rb, format_tests[i].x, format_tests[i].y); + /* On windows just test the R channel, since G/B might be 0xff or 0x00. */ + todo_wine_if(format_tests[i].todo) + ok(color_match(colour, colour_amd, 2) || broken(color_match(colour, colour_intel, 2)) + || broken(color_match(colour & 0x00ff0000, colour_amd & 0x00ff0000, 2)), + "Test %s on %s: Got unexpected colour 0x%08x at (%u, %u).\n", + shaders[j].name, format_tests[i].name, colour, format_tests[i].x, format_tests[i].y); + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + IDirect3DTexture9_Release(tex); + } IDirect3DTexture9_Release(texture); for (i = 0; i < ARRAY_SIZE(ps); ++i)

1 0