wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Łukasz Wojniłowicz : Polish translation for release 1.9.16
by Jeremy Newman 08 Aug '16

08 Aug '16

Module: website Branch: master Commit: a5eb6afbb62844e151c89654f958e90cc852ef40 URL: http://source.winehq.org/git/website.git/?a=commit;h=a5eb6afbb62844e151c896… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 6 06:33:57 2016 +0200 Polish translation for release 1.9.16 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016080501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2016080501.xml b/news/pl/2016080501.xml new file mode 100644 index 0000000..e584d0b --- /dev/null +++ b/news/pl/2016080501.xml @@ -0,0 +1,17 @@ +<news> +<date>Sierpień 5, 2016</date> +<title>Wydano Wine 1.9.16</title> +<body> + Wydanie rozwojowe Wine 1.9.16 jest już dostępne. + <a href="{$root}/announce/1.9.16">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza zgodność 64-bitowych plików binarnych na MacOS.</li> + <li>Zwiększenie wydajności w JavaScript.</li> + <li>Postęp w kierunku strumienia poleceń Direct3D.</li> + <li>Więcej instrukcji cieniowania w Direct3D.</li> + <li>Zwiększenie wydajności w GDI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.16.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.9.16
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: website Branch: master Commit: f249f1a6631f086538f692aed3fab961c829c86e URL: http://source.winehq.org/git/website.git/?a=commit;h=f249f1a6631f086538f692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 16:20:31 2016 -0500 Wine release 1.9.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016080501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016080501.xml b/news/en/2016080501.xml new file mode 100644 index 0000000..81b98cc --- /dev/null +++ b/news/en/2016080501.xml @@ -0,0 +1,17 @@ +<news> +<date>August 5, 2016</date> +<title>Wine 1.9.16 Released</title> +<body> + The Wine development release 1.9.16 is now available. + <a href="{$root}/announce/1.9.16">What's new</a> in this release: +<ul> + <li>Better 64-bit binary compatibility on macOS.</li> + <li>Performance improvements in JavaScript.</li> + <li>More progress towards the Direct3D command stream.</li> + <li>More shader instructions in Direct3D.</li> + <li>Performance improvements in GDI.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.16.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.9.16 : Alexandre Julliard : Release 1.9.16
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: refs/tags/wine-1.9.16 Tag: ab95fdd83e243d39e13d7f3d52802b16cc1b06ba URL: http://source.winehq.org/git/wine.git/?a=tag;h=ab95fdd83e243d39e13d7f3d5280… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 16:05:46 2016 -0500 Release 1.9.16

1 0

Alexandre Julliard : Release 1.9.16.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 3852d3357d087353d71d4d11359014a97dbf3e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3852d3357d087353d71d4d113… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 16:05:46 2016 -0500 Release 1.9.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 764 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 434 insertions(+), 354 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3852d3357d087353d71d4…

1 0

Michael Stefaniuc : gdiplus/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 5fce51236cd7b11f68937eb82f319b0476913c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce51236cd7b11f68937eb82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:44:31 2016 +0200 gdiplus/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 4 +--- dlls/gdiplus/tests/image.c | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e82db16..56be8eb 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3763,10 +3763,8 @@ todo_wine expected_width = base_cx * pt.Y; expected_height = base_cy * pt.Y; - if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel) + todo_wine_if(td[i].unit != UnitDisplay && td[i].unit != UnitPixel) ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); - else - todo_wine ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); ok(fabs(expected_height - bounds.Height) <= 0.001, "%u: expected %f, got %f\n", i, expected_height, bounds.Height); GdipDeleteGraphics(graphics); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index be93a20..ad84feb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3167,12 +3167,7 @@ static void test_image_properties(void) status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); - if (td[i].image_data == pngimage || td[i].image_data == jpgimage) - todo_wine - ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, - " %u: expected property count %u or %u, got %u\n", - i, td[i].prop_count, td[i].prop_count2, prop_count); - else + todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage) ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, " %u: expected property count %u or %u, got %u\n", i, td[i].prop_count, td[i].prop_count2, prop_count);

1 0

Nikolay Sivov : gdiplus: Remove some casts.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 2de908f3ff09cddf4eccfd50eea18d38842960a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de908f3ff09cddf4eccfd50e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 09:32:46 2016 +0300 gdiplus: Remove some casts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 2 +- dlls/gdiplus/image.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b8a6866..ed29990 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -178,7 +178,7 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) if (stat == Ok) { new_texture->transform = texture->transform; - *clone = (GpBrush*)new_texture; + *clone = &new_texture->brush; } else *clone = NULL; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1681099..4d0496a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1290,7 +1290,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, } if (stat != Ok) - GdipDisposeImage((GpImage*)*dstBitmap); + GdipDisposeImage(&(*dstBitmap)->image); } if (stat != Ok) @@ -1523,8 +1523,8 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, if (!bitmap || !hbmReturn) return InvalidParameter; - GdipGetImageWidth((GpImage*)bitmap, &width); - GdipGetImageHeight((GpImage*)bitmap, &height); + GdipGetImageWidth(&bitmap->image, &width); + GdipGetImageHeight(&bitmap->image, &height); bih.biSize = sizeof(bih); bih.biWidth = width; @@ -1648,7 +1648,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) if (stat != Ok) { DeleteObject(iinfo.hbmColor); DeleteObject(iinfo.hbmMask); - GdipDisposeImage((GpImage*)*bitmap); + GdipDisposeImage(&(*bitmap)->image); return stat; } @@ -3027,7 +3027,7 @@ static void add_property(GpBitmap *bitmap, PropertyItem *item) UINT i; char *item_value; - GdipGetPropertySize((GpImage *)bitmap, &prop_size, &prop_count); + GdipGetPropertySize(&bitmap->image, &prop_size, &prop_count); prop_item = heap_alloc_zero(prop_size + item->length + sizeof(PropertyItem)); if (!prop_item) return; @@ -3714,11 +3714,11 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi } if (SUCCEEDED(hr) && status == Ok) - *image = (GpImage*)bitmap; + *image = &bitmap->image; else { *image = NULL; - GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage(&bitmap->image); } if (SUCCEEDED(hr) && status == Ok) @@ -5047,7 +5047,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi entry[i].peGreen << 8 | entry[i].peBlue; } - retval = GdipSetImagePalette((GpImage*)*bitmap, palette); + retval = GdipSetImagePalette(&(*bitmap)->image, palette); } heap_free(palette); @@ -5055,7 +5055,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi if (retval != Ok) { - GdipDisposeImage((GpImage*)*bitmap); + GdipDisposeImage(&(*bitmap)->image); *bitmap = NULL; } } @@ -5310,7 +5310,7 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) if (stat == Ok) move_bitmap(bitmap, new_bitmap, FALSE); else - GdipDisposeImage((GpImage*)new_bitmap); + GdipDisposeImage(&new_bitmap->image); return stat; }

1 0

Nikolay Sivov : d3dx9/tests: Remove dead assignment.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 0054621b70cf2f1e123af5a1f61c1b572d5d35c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0054621b70cf2f1e123af5a1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 22:26:24 2016 +0300 d3dx9/tests: Remove dead assignment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index f2a0751..95dd06e 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -3734,7 +3734,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da pt->corner = POINTTYPE_CURVE_END; } outline->count--; - lastpt = &outline->items[outline->count - 1]; } else { /* outline closed with a line from end to start point */ attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE);

1 0

Nikolay Sivov : d3dx9: Remove dead assignment (Coverity).
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 29fee71f1d0e26680c858dc44ce42885f4e3cd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fee71f1d0e26680c858dc44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 09:17:16 2016 +0300 d3dx9: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 3204ea7..c26aa72 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5662,7 +5662,6 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da pt->corner = POINTTYPE_CURVE_END; } outline->count--; - lastpt = &outline->items[outline->count - 1]; } else { /* outline closed with a line from end to start point */ attempt_line_merge(outline, outline->count - 1, &pt->pos, FALSE, cos_table);

1 0

Józef Kucia : d3dx9/tests: Fix compilation when the INFINITY macro is not available.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 61de92735593eb79df8145c31ba84b6127ab1f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61de92735593eb79df8145c31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 4 17:52:14 2016 +0200 d3dx9/tests: Fix compilation when the INFINITY macro is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 41db494..b3845c5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -22,6 +22,15 @@ #include "wine/test.h" #include "d3dx9.h" +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif /* INFINITY */ + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) /* helper functions */ @@ -4181,7 +4190,7 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe static void test_effect_preshader_ops(IDirect3DDevice9 *device) { - static const struct test_preshader_op_def op_tests[] = + const struct test_preshader_op_def op_tests[] = { {"exp", 0x10500001, 1, {0x3f800000, 0x3f800000, 0x3e5edc66, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}},

1 0

Matteo Bruni : d3dx9/tests: Add a test for texture shaders.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: a7a89b8b003ae7c642ca30b6ec6ed120494e2e17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a89b8b003ae7c642ca30b6e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 5 20:56:35 2016 +0200 d3dx9/tests: Add a test for texture shaders. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 242 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 87d13d2..011f756 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -116,6 +116,22 @@ static inline void expect_vec4_(unsigned int line, const D3DXVECTOR4 *expected, got->x, got->y, got->z, got->w); } +static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) +{ + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) + return FALSE; + return TRUE; +} + static BOOL is_autogenmipmap_supported(IDirect3DDevice9 *device, D3DRESOURCETYPE resource_type) { HRESULT hr; @@ -1991,6 +2007,230 @@ static void test_D3DXSaveTextureToFileInMemory(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(volume_texture); } +void test_texture_shader(void) +{ + static const DWORD shader_zero[] = {0x0}; + static const DWORD shader_invalid[] = {0xeeee0100}; + static const DWORD shader_empty[] = {0xfffe0200, 0x0000ffff}; +#if 0 +float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR +{ + return float4(pos, 1.0); +} +#endif + static const DWORD shader_code[] = + { + 0x54580100, 0x0015fffe, 0x42415443, 0x0000001c, 0x0000001f, 0x54580100, 0x00000000, 0x00000000, + 0x00000100, 0x0000001c, 0x4d007874, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, + 0x72656461, 0x6d6f4320, 0x656c6970, 0x2e392072, 0x392e3932, 0x332e3235, 0x00313131, 0x000afffe, + 0x54494c43, 0x00000004, 0x00000000, 0x3ff00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x0014fffe, 0x434c5846, 0x00000002, 0x10000003, 0x00000001, 0x00000000, + 0x00000003, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x10000001, 0x00000001, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000004, 0x00000003, 0xf0f0f0f0, 0x0f0f0f0f, 0x0000ffff, + }; + IDirect3DVolumeTexture9 *volume_texture; + IDirect3DCubeTexture9 *cube_texture; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + ID3DXTextureShader *tx; + unsigned int x, y, z; + ID3DXBuffer *buffer; + unsigned int *data; + D3DLOCKED_RECT lr; + D3DLOCKED_BOX lb; + IDirect3D9 *d3d; + D3DCAPS9 caps; + HRESULT hr; + HWND wnd; + + hr = D3DXCreateTextureShader(NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(NULL, &tx); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_invalid, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_zero, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_empty, &tx); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DXCreateTextureShader(shader_code, &tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer); + todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + if (FAILED(hr)) + { + skip("Texture shaders not supported, skipping further tests.\n"); + IUnknown_Release(tx); + return; + } + ID3DXBuffer_Release(buffer); + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window.\n"); + IUnknown_Release(tx); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) + { + skip("Couldn't create IDirect3D9 object.\n"); + DestroyWindow(wnd); + IUnknown_Release(tx); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + IUnknown_Release(tx); + return; + } + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, + &texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillTextureTX(texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DTexture9_LockRect(texture, 0, &lr, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lr.pBits; + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + unsigned int expected = 0xff000000 | x << 16 | y << 8; + /* The third position coordinate is apparently undefined for 2D textures. */ + unsigned int color = data[y * lr.Pitch / sizeof(*data) + x] & 0xffffff00; + + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u).\n", color, x, y); + } + } + hr = IDirect3DTexture9_UnlockRect(texture, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + + IDirect3DTexture9_Release(texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Cube textures not supported, skipping tests.\n"); + goto cleanup; + } + + hr = IDirect3DDevice9_CreateCubeTexture(device, 256, 1, 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, + &cube_texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillCubeTextureTX(cube_texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + for (z = 0; z < 6; ++z) + { + static const char * const mapping[6][3] = + { + {"-x", "-y", "1"}, + {"+x", "-y", "0"}, + {"+y", "1", "+x"}, + {"-y", "0", "+x"}, + {"1", "-y", "+x"}, + {"0", "-y", "-x"}, + }; + + hr = IDirect3DCubeTexture9_LockRect(cube_texture, z, 0, &lr, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lr.pBits; + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + unsigned int color = data[y * lr.Pitch / sizeof(*data) + x]; + unsigned int expected = 0xff000000; + unsigned int i; + + for (i = 0; i < 3; ++i) + { + int component; + + if (mapping[z][i][0] == '0') + component = 0; + else if (mapping[z][i][0] == '1') + component = 255; + else + component = mapping[z][i][1] == 'x' ? x * 2 - 255 : y * 2 - 255; + if (mapping[z][i][0] == '-') + component = -component; + expected |= max(component, 0) << i * 8; + } + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", + color, x, y, z); + } + } + hr = IDirect3DCubeTexture9_UnlockRect(cube_texture, z, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + } + + IDirect3DCubeTexture9_Release(cube_texture); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || caps.MaxVolumeExtent < 64) + { + skip("Volume textures not supported, skipping test.\n"); + goto cleanup; + } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 64, 64, 64, 1, 0, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = D3DXFillVolumeTextureTX(volume_texture, tx); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(volume_texture, 0, &lb, NULL, D3DLOCK_READONLY); + ok(SUCCEEDED(hr), "Locking texture failed, hr %#x.\n", hr); + data = lb.pBits; + for (z = 0; z < 64; ++z) + { + for (y = 0; y < 64; ++y) + { + for (x = 0; x < 64; ++x) + { + unsigned int expected = 0xff000000 | ((x * 4 + 2) << 16) | ((y * 4 + 2) << 8) | (z * 4 + 2); + unsigned int color = data[z * lb.SlicePitch / sizeof(*data) + y * lb.RowPitch / sizeof(*data) + x]; + + ok(compare_color(color, expected, 1), "Unexpected color %08x at (%u, %u, %u).\n", + color, x, y, z); + } + } + } + hr = IDirect3DVolumeTexture9_UnlockBox(volume_texture, 0); + ok(SUCCEEDED(hr), "Unlocking texture failed, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(volume_texture); + + cleanup: + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + IUnknown_Release(tx); +} + START_TEST(texture) { HWND wnd; @@ -2053,4 +2293,6 @@ START_TEST(texture) IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); + + test_texture_shader(); }

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016