Józef Kucia
4701425f3c
wined3d: Add buffer usage to wined3d_swapchain_desc.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-25 16:27:10 +01:00
Henri Verbeet
a64f3b9b70
d3d9/tests: Introduce a test for vertex buffer map synchronisation.
...
Based on a patch by Patrick Rudolph from a while ago.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-01-03 17:47:15 +01:00
Stefan Dösinger
1437317819
d3d9/tests: Work around focus-follows-mouse test failures.
...
Removing WS_VISIBLE without updating the window state with
SWP_FRAMECHANGED is enough to trigger d3d9's hidden window codepath
(native and in Wine), but doesn't actually hide the window. This
prevents unpredictable focus changes on focus follows mouse WMs.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-21 16:06:02 +01:00
Józef Kucia
0ccc7c09bb
d3d9/tests: Add test for checking D3DUSAGE_AUTOGENMIPMAP support.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-11 18:21:14 +01:00
Józef Kucia
48504e73e9
d3d9: Set depth test state while resetting device.
...
wined3d will not do this anymore.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-07 19:14:27 +01:00
Józef Kucia
ad0ad75b5d
d3d9: Toggle depth test state based on auto depth stencil.
...
wined3d will not do this anymore
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-06 17:01:04 +01:00
Józef Kucia
5d2a3ad310
wined3d: Add support for D3D10+ depth bias.
...
Direct3D seems to define exact depth bias scale factors per format.
In order to make depth bias work reliably across OpenGL drivers we need
to slightly adjust depth bias values passed to glPolygonOffset().
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-06 17:00:55 +01:00
Matteo Bruni
dfba903bb2
d3d9: Stop calling wined3d_texture_generate_mipmaps().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-05 20:30:05 +01:00
Józef Kucia
93d45c04c4
d3d9: Clamp clip plane index to valid range.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-04 11:52:00 +01:00
Józef Kucia
3e61833807
d3d9/tests: Add test for clip planes limits.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-04 11:51:53 +01:00
Stefan Dösinger
04d4584dea
wined3d: Show the device window when changing fullscreen resolutions.
...
World of Warplanes calls SetWindowLong(window, GWL_STYLE, WS_POPUP)
before calling reset, effectively hiding the window. It does not call
SetWindowPos(SWP_FRAMECHANGED), so the effect isn't visible and the
game displays fine after the reset. However, after the next mouse
click WINPOS_WindowFromPoint skips the window because it doesn't have
WS_VISIBLE and returns the desktop window. This in turn triggers a
focus loss and d3d9 minimizes the game.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-01 15:56:54 +01:00
Henri Verbeet
7b09398a0b
wined3d: Clamp NULL source boxes in wined3d_device_copy_sub_resource_region().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-11-15 23:35:05 +01:00
Józef Kucia
7374c8325d
wined3d: Allow copies between compatible formats in wined3d_device_copy_sub_resource_region().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-11-15 23:35:05 +01:00
Stefan Dösinger
d334097c09
d3d9/tests: Windows 10 17.09 added an undocumented query type.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-11-07 18:13:12 +01:00
Stefan Dösinger
eb7c1fd62e
d3d9/tests: Windows 10 15.07 doesn't detect external mode changes.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-10-19 16:53:50 +02:00
Stefan Dösinger
975a686aa0
d3d9/tests: Make test_reset more resilient against DPI scaling.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-10-19 16:53:49 +02:00
Stefan Dösinger
56b223adfa
d3d9/tests: Use a borderless window for test_cursor_pos.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-10-16 15:26:33 +02:00
Akihiro Sagawa
7bdfb745ea
d3d9: Return success in d3d9_device_SetMaximumFrameLatency().
...
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-10-09 20:14:57 +02:00
Matteo Bruni
25a8773d21
wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-21 19:53:15 +02:00
Matteo Bruni
cc7c6928da
d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-21 19:53:13 +02:00
Matteo Bruni
9480e81719
d3d9/tests: Properly check for mipmap autogeneration support.
...
CheckDeviceFormat() returns D3DOK_NOAUTOGEN if the texture format is
otherwise supported.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-21 19:53:10 +02:00
Nikolay Sivov
a5328e51df
d3d9/tests: Some tests for D3DPRESENTFLAG_LOCKABLE_BACKBUFFER mode.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-19 13:27:32 +02:00
Nikolay Sivov
be1f61e275
d3d9/tests: Test for GetDC()-capable backbuffer created with D3DFMT_UNKNOWN format.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-18 09:22:53 +02:00
Nikolay Sivov
67689049e2
d3d9: Ask for texture GetDC() capability GET_DC based on texture format instead of initial swapchain buffer format.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-15 17:00:53 +02:00
Matteo Bruni
22b9403d00
d3d9/tests: Trace the current test in test_signed_formats().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-11 18:42:52 +02:00
Matteo Bruni
9916837786
d3d9/tests: Add a test for "NULL" FourCC format.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-09-06 17:31:00 +02:00
Paul Gofman
0a4d3074ee
d3d9/tests: Add test for SW shader in MVP mode.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-08-26 06:29:32 +02:00
Paul Gofman
e81e14c894
d3d9/tests: Add tests for SW shaders creation in SWVP and MVP modes.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-08-24 16:58:57 +02:00
Paul Gofman
7027da7f37
d3d9/tests: Add tests for setting vertex shader constants in SWVP and MVP modes.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-08-24 16:58:52 +02:00
Henri Verbeet
d4bd150c23
d3d9/tests: Introduce a test for drawing with a destroyed window.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-08-02 20:20:17 +02:00
Józef Kucia
c4e4357eb5
d3d9: Validate D3DQUERYTYPE.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-25 20:47:47 +02:00
Józef Kucia
42951f3e10
d3d9/tests: Add test for invalid query types.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-23 17:34:41 +02:00
Józef Kucia
5a03f2c430
d3d9/tests: Use ARRAY_SIZE() macro in device tests.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-23 17:34:39 +02:00
Józef Kucia
c675bf4e82
wined3d: Add support for patch list primitive type.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-19 14:01:35 +02:00
Józef Kucia
487d2e0279
wined3d: Add support for patch constant signatures.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-12 16:11:13 +02:00
Józef Kucia
6c5a90e193
wined3d: Add "parent_ops" for query objects.
...
In order to implement proper refcounting for
d3d11_immediate_context_SetPredication().
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:48 -05:00
Józef Kucia
e14e7e3237
wined3d: Implement floating-point viewports.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-11 10:17:47 -05:00
Matteo Bruni
c329ee5673
wined3d: Fix specular lighting calculation.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-05-08 10:10:50 -05:00
Stefan Dösinger
9ce5b4096f
d3d9/tests: WARP returns a random color in uninitialized color attributes.
...
ea8ba70a
made the broken(warp) condition too strict. This patch reverts
back to the old behavior of accepting any result from WARP.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-24 10:01:22 +02:00
Stefan Dösinger
2303b5a896
d3d9/tests: Accept alpha channel differences in shadow_test.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-24 10:01:17 +02:00
Stefan Dösinger
4e1f7b18bf
d3d9/tests: Accept WARP uninitialized texcoord alpha result on real cards.
...
My Radeon X1600 has the same behavior. This is consistent with the
vertex shader case in test_uninitialized_varyings with ps3_texcoord_code.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-19 09:10:33 +02:00
Stefan Dösinger
ea8ba70ad4
d3d9/tests: Accept another stale value in test_vshader_input.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-19 09:10:31 +02:00
Stefan Dösinger
bb7ba81111
d3d9/tests: Fix stream_test cases which do not use stream 0.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-13 11:38:41 +02:00
Stefan Dösinger
463880ea1f
d3d9/tests: Disable the SM3 uninitialized diffuse test.
...
With the AMD r500 Windows result we have so many combinations that I
don't see the point of testing this case. As an added bonus, we can
remove the allow_zero flag now.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-13 11:38:37 +02:00
Stefan Dösinger
71d3a4a202
d3d9/tests: Allow 1.0 alpha in SM3 uninitialized varyings tests.
...
My Radeon X1600 shows this behavior. This makes the tests less of an
exception compared to the other ones, which also expect alpha 0.0 or
1.0.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-13 11:38:32 +02:00
Stefan Dösinger
b96da0d8be
d3d9/tests: Relax the partially initialized varyings test.
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-13 11:38:09 +02:00
Henri Verbeet
6a307598b1
wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-11 14:59:01 +02:00
Henri Verbeet
c68eaaa026
d3d9/tests: Introduce mip-mapping to add_dirty_rect_test().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-10 21:51:38 +02:00
Henri Verbeet
df6120274d
wined3d: Introduce a helper function to assign wined3d_box values.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-07 11:37:28 +02:00
Henri Verbeet
49f2a1ab2f
wined3d: Ignore the blitter's depth/colour fill return value in wined3d_device_clear_rendertarget_view().
...
Direct3D 10 and later don't have a return value, earlier versions seem to
claim success even if the fill/clear is unsupported.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-03 12:00:04 +02:00
Józef Kucia
a5fb297ae4
d3d9/tests: Add test for vertex textures.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-14 17:14:43 +01:00
Matteo Bruni
7bcd6ed4c4
d3d9/tests: Fix test_updatetexture() on GPUs not supporting WINED3DFMT_R32_FLOAT.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-14 17:14:16 +01:00
Matteo Bruni
1a37a9fa8d
d3d9/tests: Ignore test_vshader_input() "no color attribute" test result on WARP.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-14 17:14:11 +01:00
Matteo Bruni
7ea7680966
d3d9/tests: Skip UpdateTexture tests if texture filtering isn't supported.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-10 23:21:24 +01:00
Matteo Bruni
7b34f460d8
d3d9/tests: Fix pixel shader version check in test_pointsize().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-09 20:13:23 +01:00
Matteo Bruni
101159309f
d3d9/tests: Skip test_vshader_input() if PS 3.0 isn't supported.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-09 20:13:23 +01:00
Józef Kucia
c7f3308db7
wined3d: Add support for seamless cube map filtering.
...
Seamless cube map filtering should always be enabled in D3D10+.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-08 16:37:35 +01:00
Henri Verbeet
dfe8b7798a
wined3d: Abort on invalid instructions in shader_get_registers_used().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-08 15:30:35 +01:00
Nikolay Sivov
a4be16bfe3
d3d9: Remove reference to IWineD3DDevice.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-03-06 19:45:06 +01:00
Stefan Dösinger
f3a0465c5c
d3d9/tests: AMD r500 needs dummy texture output from vertex shaders for point sprites to work.
...
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-23 20:12:48 +01:00
Józef Kucia
711539bc6e
d3d9: Merge filter_caps() into d3dcaps_from_wined3dcaps().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-21 17:23:06 +01:00
Józef Kucia
6b98526c57
d3d9: Get rid of WINECAPSTOD3D9CAPS() macro.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-21 17:23:03 +01:00
Stefan Dösinger
a5abe2c53a
d3d9/tests: Work around a r500 Windows point sprite bug.
...
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-21 17:22:47 +01:00
Henri Verbeet
7ad37a64b1
wined3d: Explicitly pass the byte-code format to shader creation functions (AFL).
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-21 08:44:15 +01:00
Henri Verbeet
7840485ac2
wined3d: Validate the SM4 token count (AFL).
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-21 08:44:12 +01:00
Józef Kucia
9d0fb20228
d3d9: Allocate WINED3DCAPS on stack.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-20 17:23:07 +01:00
Stefan Dösinger
28207ea49f
d3d9/tests: Allow a higher slop for test_updatetexture.
...
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-20 17:22:55 +01:00
Józef Kucia
1860208f5f
d3d9: Do not decrease swapchain refcount when it is already 0.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-13 18:50:12 +01:00
Józef Kucia
d39630fc39
d3d9: Do not decrease swapchain surface refcount when it is already 0.
...
Based on a patch by Henri Verbeet.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-13 18:50:12 +01:00
Nikolay Sivov
1a7ddf8dd9
dxgi: Added support for DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-09 13:16:57 +01:00
Henri Verbeet
6b8cc32a1f
d3d9: Clear the "surface" pointer on error in d3d9_device_CreateDepthStencilSurfaceEx().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-09 12:55:38 +01:00
Henri Verbeet
b28631f62f
d3d9/tests: Add a test for resource creation with D3DFMT_UNKNOWN.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-09 12:55:36 +01:00
Akihiro Sagawa
6cf2dc67e1
wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures.
...
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-06 14:47:17 +01:00
Akihiro Sagawa
87fe9779ec
d3d9/tests: Add LockRect tests with dynamic textures.
...
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-06 14:47:13 +01:00
Józef Kucia
78a945e7bf
d3d9: Store query data size in "d3d9_query".
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-03 19:05:13 +01:00
Józef Kucia
6b6c6069ed
d3d9: Fix query result data for not started queries.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-03 19:05:13 +01:00
Józef Kucia
8d6af6d932
wined3d: Return WINED3DERR_INVALIDCALL for not started queries.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-03 19:05:12 +01:00
Józef Kucia
cde106d225
d3d9/tests: Extend queries tests.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-03 19:05:12 +01:00
Matteo Bruni
7e30dc8b4e
d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-30 21:38:48 +01:00
Matteo Bruni
ea11b27528
d3d9/tests: Add a test for DrawIndexedPrimitiveUP().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-25 15:52:41 +01:00
Matteo Bruni
bbce5af7d3
d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-25 15:52:37 +01:00
Józef Kucia
14e2412783
d3d9/tests: Remove redundant state setting calls.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-17 15:41:38 +01:00
Józef Kucia
cb46a245c1
d3d9: Avoid '\n' in middle of TRACE() message.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-13 16:28:02 +01:00
Józef Kucia
07392b39fb
d3d9/tests: Accept 64-bit Windows FPU setup behavior.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-13 16:28:00 +01:00
Józef Kucia
6664601b83
d3d9: Return D3D_OK from UnlockRect() for not locked textures.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-13 16:27:44 +01:00
Józef Kucia
52452b271e
d3d9/tests: Add more tests for UnlockRect().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-13 16:27:40 +01:00
Józef Kucia
e8360b8eaa
d3d9: Do not create render target view while surface refcount is equal to 0.
...
This fixes a regression introduced by commit
b005ad6f90
.
A render target view has to be created when a surface is referenced.
Otherwise the render target view reference count would be inconsistent
with the surface reference count.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-06 16:29:07 +01:00
Józef Kucia
7e616af6ea
d3d9/tests: Add d3d9ex test for backbuffer resize.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-05 14:54:50 +01:00
Józef Kucia
0cf81686b6
d3d9/tests: Do not assume surface size and format in get_pixel_color().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-05 14:54:48 +01:00
Józef Kucia
a7918817d4
d3d9/tests: Add test for stale render target views regression.
...
This test exercises a regression introduced by commit
b005ad6f90
.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-05 14:54:41 +01:00
Józef Kucia
c6795afcdd
d3d9/tests: Do not assume surface size and format in get_rt_readback().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-05 14:54:39 +01:00
Józef Kucia
c1aba7cd8b
d3d9: Reject render target surfaces created for other devices.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-03 16:18:40 +01:00
Józef Kucia
6e6b377c22
d3d9/tests: Add test for render target device mismatch.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-03 16:18:34 +01:00
Józef Kucia
e2e0c747a8
wined3d: Filter messages for fullscreen mode changes.
...
This fixes a regression introduced by commit
d9f8cba50f
.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-14 10:32:44 +01:00
Józef Kucia
37daa35737
d3d9/tests: Add test showing WM_SIZE is not sent during fullscreen mode change.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-14 10:32:42 +01:00
Józef Kucia
ffcea8af77
wined3d: Implement primitive restart.
...
Based on a patch by Andrew Wesie.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-08 13:54:06 +01:00
Józef Kucia
49f6aa32ef
d3d9/tests: Add test showing that primitive restart must be disabled.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-08 13:54:06 +01:00
Józef Kucia
6b80fe5095
d3d9/tests: Add test for occlusion query with result bigger than UINT32_MAX.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-25 19:48:58 +01:00
Józef Kucia
c0fb3fb9e1
wined3d: Increase data size for occlusion queries to 8 bytes.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-22 16:34:36 +01:00
Józef Kucia
5b0cd6fa3e
d3d9/tests: Add test for evicting bound resources.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-03 17:14:03 +01:00
Józef Kucia
aa11efc4af
wined3d: Get rid of WINED3DFMT_VERTEXDATA.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-03 17:14:01 +01:00
Józef Kucia
89ba457011
d3d9/tests: Add test for checking buffer resource format support.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-03 17:13:57 +01:00
Matteo Bruni
13ae8c91d1
d3d9/tests: Add a test for the dsy SM3 instruction.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-10-07 13:11:49 +02:00
Matteo Bruni
65f20ffc50
d3d9/tests: Make the window client rect match the d3d swapchain size.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-10-07 13:11:46 +02:00
André Hentschel
ddc6e027a4
d3d9/tests: Allow D3D_OK for lost device present (Win10).
...
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-21 21:32:52 +09:00
Michael Stefaniuc
5562339681
d3d9: Avoid a cast from a COM object to an interface.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-07 22:18:18 +09:00
Nikolay Sivov
53b7a2a1a1
wined3d: Add texture flag to indicate GetDC() capability.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-02 23:34:25 +09:00
Henri Verbeet
4987ef49bd
d3d9: Use resource mapping functions in d3d9_device_DrawIndexedPrimitiveUP().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-02 11:27:22 +09:00
Henri Verbeet
5505e1ae76
d3d9: Use resource mapping functions in d3d9_device_DrawPrimitiveUP().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-02 11:27:17 +09:00
Henri Verbeet
a6e17d1108
d3d9: Use wined3d_resource_unmap() in d3d9_indexbuffer_Unlock().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-30 19:09:21 +09:00
Henri Verbeet
4d638863fb
d3d9: Use wined3d_resource_map() in d3d9_indexbuffer_Lock().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-30 19:09:21 +09:00
Henri Verbeet
f1e7806721
d3d9: Use wined3d_resource_unmap() in d3d9_vertexbuffer_Unlock().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-30 19:09:20 +09:00
Henri Verbeet
a0400a686c
d3d9: Use wined3d_resource_map() in d3d9_vertexbuffer_Lock().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-30 19:09:20 +09:00
Patrick Rudolph
3f7e5d647e
wined3d: Handle WINED3DFMT_FLAG_BROKEN_PITCH in wined3d_format_calculate_size().
...
The broken pitch calculation also affects the resource memory layout, as
evidenced by the mip-tree layout tests. Found using apitrace, which crashes on
Wine when playing back traces containing ATI1 textures.
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-26 23:23:44 +09:00
Józef Kucia
53714bd6a8
d3d9: Forbid display mode and back buffer mismatch in IDirect3DDevice9Ex_ResetEx().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-24 22:24:02 +09:00
Józef Kucia
c1cc6e45da
d3d9: Allow passing "mode" to IDirect3DDevice9Ex_ResetEx() iff "Windowed" is FALSE.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-24 22:23:59 +09:00
Józef Kucia
de3ca49952
d3d9/tests: Add test for IDirect3DDevice9Ex_ResetEx().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-24 22:23:57 +09:00
Józef Kucia
677a9349c7
d3d9/tests: Restore display rotation in test_get_adapter_displaymode_ex().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-24 22:23:54 +09:00
Józef Kucia
7d836b3f13
d3d9/tests: Add test for regression in IDirect3DDevice9_Reset().
...
This adds a test for regression introduced in
cad279449c
.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-17 11:52:37 +09:00
Henri Verbeet
53165034ba
wined3d: Unify resource preloads.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-11 12:08:58 +09:00
Józef Kucia
eaa20836d2
wined3d: Do not enable blending for edge/line antialiasing.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-10 23:56:50 +09:00
Józef Kucia
5a4d218563
d3d9/tests: Add test for line antialiasing blending.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-09 22:00:01 +09:00
Józef Kucia
8d032351f2
wined3d: Add WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH flag.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-03 09:56:17 -05:00
Matteo Bruni
e592b541a1
d3d9/tests: Add a vertex blending test with D3DCOLOR weights.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-01 09:57:31 -05:00
Józef Kucia
8b493d769e
wined3d: Introduce R10G10B10X2 vertex formats for D3D8/9.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-27 22:21:12 +09:00
Michael Stefaniuc
05525db806
d3d9: Use SetRect() instead of open coding it.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-14 17:40:10 +09:00
Michael Stefaniuc
080c74497d
d3d9/tests: Use SetRect() instead of open coding it.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-03 10:17:46 +09:00
Michael Stefaniuc
bcd38dec15
d3d9/tests: Use wine_dbgstr_rect() to print RECTs.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-10 20:34:04 +09:00
Józef Kucia
42fcf20221
wined3d: Implement index buffer offset.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-03 00:10:49 +09:00
Francois Gouget
c000733e90
d3d9/tests: Fix a trailing ok() '\n'.
...
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-30 19:49:25 +09:00
Józef Kucia
bd41d53a23
d3d9: Check if valid vertex declaration is set before issuing draw call.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-24 20:03:15 +09:00
Józef Kucia
e8aa575ff6
d3d9/tests: Add some tests for draw methods.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-24 20:03:12 +09:00
Henri Verbeet
569fcd33dc
wined3d: Store shader signatures directly in struct wined3d_shader_desc.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-24 16:19:07 +09:00
Józef Kucia
e47a735f76
wined3d: Add wined3d creation flag for selecting unbound resource color.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-23 19:23:45 +09:00
Józef Kucia
d283c5b68e
d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-19 20:26:49 +09:00
Henri Verbeet
d701a76ca1
wined3d: Make wined3d_device_get_ps_consts_b() consistent with wined3d_device_get_ps_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:55 +09:00
Henri Verbeet
0a8951d99b
wined3d: Make wined3d_device_set_ps_consts_b() consistent with wined3d_device_set_ps_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:50 +09:00
Henri Verbeet
9c8c391146
wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:44 +09:00
Henri Verbeet
73ba87658c
wined3d: Make wined3d_device_set_vs_consts_b() consistent with wined3d_device_set_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 10:35:39 +09:00
Henri Verbeet
f69cf783df
wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:16 +09:00
Henri Verbeet
596f707797
wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:15 +09:00
Henri Verbeet
3ae7ab9583
wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:15 +09:00
Henri Verbeet
ba840a4c05
wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 01:06:14 +09:00
Andrey Gusev
0a9f22facc
d3d9/tests: Fix a typo in skip() message.
...
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-14 14:39:54 +09:00
Henri Verbeet
1fe83c0d7e
wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:52 +09:00
Henri Verbeet
574e294181
wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:46 +09:00
Henri Verbeet
67ec18ba2c
wined3d: Pass wined3d_vec4 structures to wined3d_device_get_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:40 +09:00
Henri Verbeet
d3a3260763
wined3d: Pass wined3d_vec4 structures to wined3d_device_set_vs_consts_f().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-27 12:40:35 +09:00
Józef Kucia
64014ae3ed
wined3d: Add "layer_count" parameter to wined3d_texture_create().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-26 21:35:31 +09:00
Henri Verbeet
58a1796d83
wined3d: Don't enumerate sub-resources in wined3d_device_reset().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 15:34:43 +09:00
Henri Verbeet
3b96ac290d
wined3d: Allocate system memory for complete textures.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-21 14:09:39 +09:00
Henri Verbeet
f519aca8b3
wined3d: Reject sub-resource types in wined3d_check_device_format().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 14:56:14 +09:00
Francois Gouget
0277ba190b
d3d9/tests: Spelling fixes for a couple of ok() calls.
...
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:05:06 +09:00
Henri Verbeet
82a7f1ebf2
wined3d: Implement texture DC creation on top of D3DKMTCreateDCFromMemory().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-15 12:32:25 +09:00
Henri Verbeet
cf259ea41e
d3d9/tests: Add some tests for the properties of the DC returned by surface GetDC().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:07 +09:00
Henri Verbeet
9e763ab92b
wined3d: Be more strict with wined3d_texture_get_dc() calls from d3d9.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:06 +09:00
Henri Verbeet
c3d74913b7
wined3d: Be more lenient with wined3d_texture_get_dc() calls from ddraw.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:06 +09:00
Stefan Dösinger
301c9a4d5c
d3d9/tests: Add a system memory miptree layout test.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-12 12:03:39 +09:00
Henri Verbeet
b8ffc4df1c
d3d9/tests: Add some more surface GetDC() tests to test_getdc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-11 11:36:12 +09:00
Matteo Bruni
05f57dae24
d3d9/tests: Add a test for color varyings clamping.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-28 16:26:52 +09:00
Józef Kucia
1f8de0696f
d3d9: Avoid '\n' in middle of TRACE() messages.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 23:35:19 +09:00
Paul Gofman
1d94ec8581
d3d9/tests: Add test for D3DFMT_L8 format as render target.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-24 22:09:50 +09:00
Henri Verbeet
240912c59b
wined3d: Ignore the dirty region for swapchain presents more explicitly.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:49 +09:00
Henri Verbeet
198042e1d8
wined3d: Require a valid rectangle pointer if rect_count is non-zero in device_clear_render_targets().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 12:20:44 +09:00
Józef Kucia
c21dbb5149
wined3d: Implement depth clear in wined3d_device_clear_rendertarget_view().
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 22:45:53 +09:00
Stefan Dösinger
aeefbdffba
wined3d: Merge wined3d_surface_map() and wined3d_volume_map().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-13 15:41:53 +09:00
Stefan Dösinger
beb8986e48
wined3d: Merge wined3d_surface_unmap() and wined3d_volume_unmap().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-10 11:26:06 +09:00
Henri Verbeet
9f51e8f77e
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_3d_GetLevelDesc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-03 13:00:47 +09:00
Henri Verbeet
63256e31b3
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_cube_GetLevelDesc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:16 +09:00
Henri Verbeet
47c20218b7
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:14 +09:00
Henri Verbeet
352667d439
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_volume_GetDesc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:12 +09:00
Henri Verbeet
7fad350ccf
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:10 +09:00
Henri Verbeet
fc87c40c3e
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:07 +09:00
Henri Verbeet
4917b98753
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_StretchRect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-02 12:08:05 +09:00
Henri Verbeet
f4c8d81489
d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_GetRenderTargetData().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 12:06:42 +09:00
Stefan Dösinger
ae5931a62e
d3d9/tests: Test multisample flip.
...
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:12 +09:00
Stefan Dösinger
d71f452c4d
wined3d: Rotate through swapchain buffers.
...
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:12 +09:00
Henri Verbeet
17ce029f55
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_GetVolumeLevel().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-26 18:38:56 +09:00
Henri Verbeet
6f98e85783
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_UnlockBox().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-26 18:38:52 +09:00
Henri Verbeet
9c280ddc84
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_LockBox().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-26 18:38:48 +09:00
Henri Verbeet
74bc7c4338
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_GetCubeMapSurface().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-26 18:38:43 +09:00
Henri Verbeet
ec590c8404
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-26 18:38:38 +09:00
Henri Verbeet
a020fe383e
d3d9: Use wined3d_texture_get_sub_resource_parent in d3d9_texture_cube_LockRect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-24 10:33:24 +09:00
Henri Verbeet
92f1afc045
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_GetSurfaceLevel().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-24 10:33:20 +09:00
Henri Verbeet
75c3a08eb2
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_UnlockRect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-24 10:33:16 +09:00
Henri Verbeet
8e2efc65e7
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_2d_LockRect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-24 10:33:12 +09:00
Henri Verbeet
a81152df36
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_swapchain_GetBackBuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-24 10:33:07 +09:00
Henri Verbeet
bd38c16ec2
d3d9: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-20 12:08:06 +09:00
Henri Verbeet
55f2d655ca
d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_device_create_surface().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-20 12:08:06 +09:00
Frédéric Delanoy
77c05ebc4e
d3d9/tests: Use todo_wine_if() in tests.
...
Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-18 01:17:25 +09:00
Henri Verbeet
3b5eca269d
wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Józef Kucia
a6e056d26a
d3d9/tests: Add test for surface format gamma correction query.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 00:37:26 +09:00
Józef Kucia
1769ea38e6
wined3d: Add support for separate sRGB formats.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 00:37:25 +09:00
Matteo Bruni
f088e46dbe
d3d11: Implement d3d11_device_CheckMultisampleQualityLevels().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 20:35:00 +09:00
Henri Verbeet
04c216d798
d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_GetRenderTargetData().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:14 +09:00
Henri Verbeet
7b266e844e
d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_StretchRect().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:13 +09:00
Matteo Bruni
7fd7516922
d3d9/tests: Test the creation of render targets with invalid multisample settings.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 00:42:26 +09:00
Matteo Bruni
57c1f072f0
d3d9/tests: Extend test_checkdevicemultisampletype().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 00:42:26 +09:00
Matteo Bruni
99bcae0229
wined3d: Fail texture creation when invalid multisample settings are specified.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 00:42:26 +09:00
Riccardo Bortolato
edf003771b
d3d9: Replace wined3d surface refcounting with texture refcounting.
...
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:44:12 +09:00