Commit Graph

2409 Commits

Author SHA1 Message Date
Henri Verbeet 3c54eefaca ddraw: Get the texture format from the texture in d3d_device3_SetRenderState().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Henri Verbeet 8c93a90f78 ddraw: Get the texture format from the texture in d3d_device3_GetRenderState().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Henri Verbeet 5c1976c43b wined3d: Introduce wined3d_texture_set_sub_resource_parent().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Frédéric Delanoy 3e53214092 ddraw/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:24 +09:00
Henri Verbeet f984f56fd8 ddraw: Use wined3d_texture_get_sub_resource_parent() in ddraw_surface_create().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-17 13:05:59 +09:00
Henri Verbeet 9d7221b51d wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields.
It's a happy coincidence that none of the surface pointers are actually used.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet 0b6b5176cc wined3d: Get rid of unused/unimplemented WINEDDBLT_* flags.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet 47635a60a0 ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:36 +09:00
Henri Verbeet 05b84945d5 wined3d: Get rid of the unused _WINEDDOVERLAYFX structure.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:36 +09:00
Henri Verbeet c6a7284924 ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-13 13:22:56 +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
Henri Verbeet 6e5fa92299 ddraw: Use wined3d_texture_get_pitch() in ddraw_surface_init().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet 1b106fe830 ddraw: Use the correct height when calculating the linear size in ddraw_surface_init().
This fixes a regression introduced by commit
7d45318aea.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:02 +09:00
Riccardo Bortolato b278bb8f56 wined3d: Get rid of wined3d_device_get_surface_from_dc().
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-02-09 12:19:39 +09:00
Henri Verbeet f0053d06c4 wined3d: Get rid of wined3d_surface_update_overlay_z_order().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:21 +09:00
Henri Verbeet 02008a6f2e wined3d: Introduce wined3d_texture_update_overlay().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:14 +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
Henri Verbeet ea85a1ca59 wined3d: Introduce wined3d_texture_set_overlay_position().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:53 +09:00
Henri Verbeet 6e30b042e1 wined3d: Introduce wined3d_texture_get_overlay_position().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:40 +09:00
Henri Verbeet 9628db25f6 ddraw/tests: Rewrite rectangle_settings().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:24 +09:00
Henri Verbeet 03ef393ae4 ddraw/tests: Rewrite offscreen_test().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:24:39 +09:00
Henri Verbeet b2b61094e0 ddraw/tests: Rewrite yv12_test().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:24:23 +09:00
Henri Verbeet b170952230 ddraw: Use wined3d_texture_get_sub_resource() in ddraw_surface7_Flip().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:49 +09:00
Henri Verbeet 7d45318aea ddraw: Move the mip-level dimensions fix-up from ddraw_surface_init() to ddraw_surface_create().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:43 +09:00
Henri Verbeet 6037179f6b ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:44 +09:00
Henri Verbeet 44f2589e7c ddraw: Use wined3d_resource_unmap() in ddraw_surface7_Unlock().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:38 +09:00
Henri Verbeet 36187987ed ddraw: Use wined3d_resource_map() in surface_lock().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:32 +09:00
Henri Verbeet 6b2a080372 ddraw: Use wined3d_resource_map() in d3d_texture2_Load().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:39:01 +09:00
Henri Verbeet 7e57924d32 ddraw: Use wined3d_texture_release_dc() in ddraw_surface7_ReleaseDC().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:55 +09:00
Henri Verbeet 83a147d98a ddraw: Use wined3d_texture_get_dc() in ddraw_surface7_GetDC().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:45 +09:00
Henri Verbeet 88c9ade49c ddraw: Use wined3d_texture_get_dc() in ddraw_surface_update_frontbuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:39 +09:00
Henri Verbeet 59116f833e ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad().
This is safe because D3D is always initialized in D3D device methods.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:38 +09:00
Henri Verbeet 8ae4580137 ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:37 +09:00
Henri Verbeet f7e9604c3e ddraw: Use wined3d_texture_blt() in copy_mipmap_chain().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:37 +09:00
Henri Verbeet 257ee8cc6e ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:36 +09:00
Henri Verbeet 1a812eb666 ddraw: Use wined3d_texture_blt() in ddraw_surface_blt_clipped().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:36 +09:00
Henri Verbeet d6e7f18c84 ddraw: Use wined3d_texture_blt() in ddraw_surface7_BltFast().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:15 +09:00
Henri Verbeet ce882bd6b4 ddraw: Always store a pointer to the wined3d texture in the surface.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:15 +09:00
Józef Kucia 3cffe92315 ddraw: Return DDERR_INVALIDPARAMS for render states >= D3DSTATE_OVERRIDE_BIAS.
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-01-29 00:42:26 +09:00
Henri Verbeet 58a7c3cb7d ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface7_BltFast().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:43:52 +09:00
Henri Verbeet 643f1f1c74 ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_blt_clipped().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:43:49 +09:00
Henri Verbeet 492e785513 ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_update_frontbuffer().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:43:45 +09:00
Henri Verbeet ad11f38db9 wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-27 12:38:54 +09:00
Henri Verbeet dafaae7730 wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-27 12:38:46 +09:00
Henri Verbeet 4d94a1e651 ddraw: DDSCAPS_ALLOCONLOAD requires DDSCAPS_TEXTURE.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:54:08 +09:00
Henri Verbeet 6dc5d194ad ddraw: DDSCAPS_ALLOCONLOAD doesn't override DDSD_LPSURFACE.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:54:04 +09:00
Henri Verbeet 6c9e1a4735 ddraw: DDSD_LPSURFACE requires a non-NULL lpSurface.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:53:58 +09:00
Stefan Dösinger 4fac292ee8 ddraw/tests: Port test_lockrect_invalid to other versions.
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-01-23 00:56:28 +09:00
Henri Verbeet 521e3a44cf ddraw: Only allow DDSCAPS_MIPMAP on textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-06 18:08:39 +01:00
Henri Verbeet cac1242a63 ddraw/tests: Merge MipMapCreationTest() with test_mipmap_lock().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-06 18:08:38 +01:00
Henri Verbeet e53567f72a ddraw: Use the largest dimension to determine the mipmap count for version 7 surfaces.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-06 18:08:38 +01:00
Henri Verbeet 9c96a525e7 wined3d: Get rid of unused error codes.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 15:45:30 +01:00
Henri Verbeet 6862fc1dd7 ddraw/tests: Don't require a 3D device for test_resource_priority().
This fixes commit b0d4502c29.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 15:45:04 +01:00
Henri Verbeet 8f91d3ccd8 ddraw: Simplify the root surface test in ddraw_surface7_GetPriority().
This fixes commit 97f0345f71. I assume it was
applied by mistake, since it's also missing the correct sign-off.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 15:44:57 +01:00
Stefan Dösinger dbd93084ce ddraw/tests: Use a slop for test_shademode.
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-01-03 20:04:22 +01:00
Riccardo Bortolato cb03e216e5 ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey().
Enabled some previously failing tests in ddraw/tests/ddraw7.c.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
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-01-03 20:03:23 +01:00
Riccardo Bortolato b0d4502c29 ddraw7/tests: Test GetPriority() on cubemap surfaces.
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-23 09:24:15 +01:00
Riccardo Bortolato 97f0345f71 ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority().
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-23 09:24:06 +01:00
André Hentschel c465401984 ddraw/tests: Rename mips to mipmaps.
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-15 09:12:46 +01:00
Henri Verbeet 571dc0faa5 ddraw: Mark surfaces as lost on mode changes.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-09 01:01:56 +09:00
Henri Verbeet 821c2ed6a3 ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-04 21:56:19 +09:00
Henri Verbeet 1ebb42ca53 ddraw: Mark surfaces as lost when the device window is deactivated.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-04 21:56:19 +09:00
Henri Verbeet 83f10e2251 ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip() when not in exclusive mode.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-04 21:56:19 +09:00
Henri Verbeet 2dca999e33 ddraw/tests: 64-bit ddraw doesn't support textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-12-01 21:05:12 +09:00
Stefan Dösinger 7e01f865ab ddraw/tests: Test color keys on cube map surfaces.
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>
2015-12-01 21:05:03 +09:00
Andrey Gusev 8bfc9bd2ee Assorted typos fixes.
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-27 15:38:30 +09:00
Henri Verbeet af196e5f25 dxgi: Implement dxgi_output_GetDesc().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-25 13:21:47 +09:00
Hugh McMaster 11669fa5e2 Assorted spelling and grammar fixes.
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-17 22:56:40 +09:00
Matteo Bruni 36800e5217 ddraw/tests: Port test_shademode() to ddraw1.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-13 22:54:20 +09:00
Matteo Bruni 053c190ca1 ddraw/tests: Port test_shademode() to ddraw2.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-13 22:54:17 +09:00
Matteo Bruni 7c1e53e0ac ddraw/tests: Port test_shademode() to ddraw4.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-13 22:54:14 +09:00
Matteo Bruni 1a3d6ad240 ddraw/tests: Port test_shademode() to ddraw7.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-13 22:54:11 +09:00
Riccardo Bortolato f7bf61ea4c ddraw: Remove unused mipmap_level from ddraw_surface.
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-04 14:41:37 +09:00
Michael Stefaniuc ad4057803d ddraw/tests: Use the proper type for a return value (PVS-Studio).
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-29 21:20:03 +09:00
Michael Stefaniuc f8b306c3a8 ddraw/tests: Test the return of DrawPrimitive().
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-21 01:04:31 +09:00
Nikolay Sivov b2855505b9 ddraw: Use proper prototype for internal enumeration callback (PVS-Studio).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-21 01:04:19 +09:00
Nikolay Sivov 8cd2d5df20 ddraw/tests: Use proper type for return values (PVS-Studio).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-14 12:46:40 +09:00
Riccardo Bortolato 9c00f968d6 d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect.
Pass wined3d_texture and sub_resource idx to device_parent_surface_created callback.
Store wined3d_texture and sub_resource in d3d8_surface.
Also updated d3d9, d3d11, ddraw callbacks accordingly.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-12 23:34:56 +09:00
Riccardo Bortolato 33bb9e9610 wined3d: Don't pass a wined3d_volume to device_volume_created callback anymore.
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-08 21:00:07 +09:00
Riccardo Bortolato 9621737c8e wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback.
Store wined3d_texture and sub_resource in d3d8_volume.
Updated the d3d8_volume_LockBox to make use of wined3d_texture_map.
Also updated d3d9, d3d11, ddraw callbacks accordingly.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
2015-10-07 21:28:52 +09:00
Riccardo Bortolato 1d1487105d wined3d: Pass a wined3d_box to wined3d_surface_map..
Introduced a new surface_check_block_align function that accepts a
wined3d_box, eventually the old _rect version will be completely
replaced.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
2015-10-07 21:28:51 +09:00
Riccardo Bortolato 825b141e5a wined3d: Remove wined3d_surface_get_flip_status stub. 2015-09-10 20:00:52 +09:00
Riccardo Bortolato e869ef5c0f wined3d: Remove wined3d_surface_get_blt_status stub. 2015-09-10 20:00:46 +09:00
Stefan Dösinger fa0041954f wined3d: Return a texture from the swapchain resource creation callback. 2015-09-04 20:01:05 +09:00
Stefan Dösinger 9427d1d553 ddraw/tests: Properly clean up in test_texcoordindex. 2015-08-28 19:52:56 +09:00
Stefan Dösinger 40c5303b62 ddraw: Return the right error if range color keys are used. 2015-08-24 20:42:40 +09:00
Stefan Dösinger baab5a869a ddraw/tests: Test color keying precision.
This brute force tests all values in 4, 5, 6 and 8 bit channels.
2015-08-24 20:42:28 +09:00
Michael Müller 2f17d5b136 ddraw: Make some functions hotpachable. 2015-06-12 21:23:12 +09:00
Matteo Bruni cc80f1fd9f ddraw/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX. 2015-06-11 19:34:58 +09:00
Matteo Bruni 5ec54d2f3b ddraw/tests: Accept broken testbot result for ddraw1:test_texturemapblend(). 2015-05-21 20:51:54 +09:00
Matteo Bruni 2fee34f97b ddraw/tests: Workaround a testbot failure in test_ck_rgba(). 2015-05-21 20:51:50 +09:00
Matteo Bruni 30a1fffcc7 ddraw/tests: Accept broken testbot result for test_coop_level_d3d_state(). 2015-05-21 20:51:43 +09:00
Francois Gouget 0f3de20ba0 ddraw/tests: Silence some ddrawmodes traces that generate too many lines. 2015-05-11 15:19:04 +09:00
Matteo Bruni 0cc7daebd8 ddraw/tests: Add a ddraw2 specular lighting test. 2015-05-05 18:51:08 +09:00
Matteo Bruni 6418a489e0 ddraw/tests: Accept broken testbot result for test_clear_rect_count(). 2015-05-05 18:51:06 +09:00
Francois Gouget cb16c70602 ddraw/tests: Fix compilation on systems that don't support nameless union. 2015-05-04 15:06:43 +09:00
Matteo Bruni 27de4f25cf ddraw/tests: Add a ddraw4 specular lighting test. 2015-05-01 15:45:03 +09:00
Matteo Bruni 213f7d9f45 wined3d: Implement WINED3D_LIGHT_PARALLELPOINT support in the GLSL ffp. 2015-05-01 15:45:00 +09:00
Matteo Bruni 72722222a7 ddraw: D3DRENDERSTATE_LOCALVIEWER doesn't exist before d3d7. 2015-05-01 15:44:40 +09:00
Henri Verbeet 8633fd625a ddraw/tests: Release the palette after a GetPalette() call in PaletteTest() (Valgrind). 2015-04-30 16:17:56 +09:00
Henri Verbeet 6569337cb7 ddraw/tests: Don't destroy the background material until the viewport is done with it in test_material() (Valgrind). 2015-04-30 16:17:54 +09:00
Henri Verbeet 4c5276042d ddraw: Check if the ddraw object still exists in d3d_device_inner_Release() (Valgrind). 2015-04-30 16:17:51 +09:00
Henri Verbeet 4a416f8d37 ddraw: Release the surface clipper (if any) in ddraw_surface_wined3d_object_destroyed() (Valgrind). 2015-04-30 16:17:49 +09:00
Matteo Bruni 287093e26e ddraw/tests: Add a ddraw7 specular lighting test. 2015-04-29 17:02:22 +09:00
Francois Gouget 7929155e55 ddraw/tests: Fix compilation on systems that don't support nameless unions. 2015-04-27 15:08:18 +09:00
Matteo Bruni b963c73abb wined3d: Introduce D3D7+ normal matrix computation. 2015-04-24 19:07:52 +09:00
Matteo Bruni e7548fc421 ddraw: Cleanup d3d_light_SetLight() a bit. 2015-04-23 15:14:03 +09:00
Matteo Bruni 969e72396d ddraw/tests: Fix ddraw2 test_lighting() cleanup code. 2015-04-23 15:13:59 +09:00
Matteo Bruni b6717dc2e3 ddraw/tests: Port the lighting test to the previous d3d versions. 2015-04-22 23:24:18 +09:00
Matteo Bruni 319e7fb201 ddraw/tests: Add more d3d7 lighting tests. 2015-04-22 23:24:12 +09:00
Stefan Dösinger 5d51c97d07 wined3d: Implement color keying in the glsl fragment pipeline. 2015-04-10 21:43:31 +09:00
Matteo Bruni fbffd8bae4 ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7. 2015-03-31 18:49:29 +09:00
Matteo Bruni 382c8fde08 ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn't exist before d3d7. 2015-03-31 18:49:29 +09:00
Matteo Bruni e8aba71529 ddraw: Make sure to activate / deactivate the light on D3DLIGHT_ACTIVE flag changes. 2015-03-31 18:49:29 +09:00
Matteo Bruni b41a3ad219 ddraw: Make sure AddLight properly activates lights. 2015-03-31 18:49:29 +09:00
Matteo Bruni ca7e56cfee ddraw: D3DLIGHT lights default to active.
Actually, there is no way to deactivate them short of removing them from
the viewport.
2015-03-31 18:49:29 +09:00
Henri Verbeet 94967c28b9 wined3d: Add support for half-integer pixel centers.
Like in OpenGL and Direct3D 10+.
2015-03-30 19:10:29 +09:00
Frédéric Delanoy f6a341c747 Assorted spelling/grammar fixes. 2015-03-27 22:29:48 +09:00
Stefan Dösinger bfe82190ad ddraw/tests: Port test_color_fill to earlier versions. 2015-03-27 20:40:37 +09:00
Stefan Dösinger 7897a2c058 ddraw/tests: Make sure color keying is on in test_texturemapblend. 2015-03-27 20:40:37 +09:00
Francois Gouget baf32ced74 ddraw/tests: Fix compilation on systems that don't support nameless unions. 2015-03-24 20:01:37 +09:00
Stefan Dösinger 70c6666d1e ddraw/tests: Correct executebuffer offsets. 2015-03-23 22:59:16 +09:00
Stefan Dösinger daf3e8a0dc ddraw/tests: The testbot applies color keying without a key. 2015-03-23 22:59:15 +09:00
Stefan Dösinger 02be2e38a8 ddraw: Update the palette before presents to the NULL window. 2015-03-23 22:59:14 +09:00
Henri Verbeet 1dea0c1d67 ddraw: Get rid of some comments in the middle of the copyright headers. 2015-03-20 21:32:21 +09:00
Stefan Dösinger df829de88d ddraw: Handle DDBLT_ROP in ddraw. 2015-03-18 21:03:22 +09:00
Stefan Dösinger 948202c47f ddraw: Add validation and tests for DDBLT_ROP. 2015-03-17 23:34:28 +09:00
Stefan Dösinger e0edd55a2e ddraw/tests: Add tests for DDBLT_DEPTHFILL. 2015-03-17 23:34:01 +09:00
Stefan Dösinger a84980168c ddraw: Add DDBLT_DEPTHFILL validation. 2015-03-17 23:33:56 +09:00
Stefan Dösinger 1d8e92c170 ddraw/tests: Add a DDBLT_COLORFILL test. 2015-03-17 23:33:52 +09:00
Stefan Dösinger 6cb795b4b6 ddraw: Add DDBLT_COLORFILL validation. 2015-03-17 23:33:44 +09:00
Stefan Dösinger 5061e3502e ddraw/tests: r200 ignores the alpha channel when matching color keys. 2015-03-13 22:28:30 +09:00
Stefan Dösinger 2702f28e66 ddraw: Remove support for V16U16.
None of my Windows drivers support this format. At best this will
confuse applications trying to pick X8L8V8U8.
2015-03-11 22:09:29 +09:00
Stefan Dösinger b07b350286 ddraw: Set DDPF_BUMPLUMINANCE for V5U5L6 and X8L8V8U8. 2015-03-11 22:09:24 +09:00
Stefan Dösinger 937522ffd0 ddraw/tests: Add a test for signed formats. 2015-03-11 22:09:15 +09:00
Francois Gouget e928f5544e ddraw/tests: Fix compilation on systems that don't support nameless unions. 2015-03-08 17:46:52 +09:00
Michael Stefaniuc bd9d41080f ddraw/tests: Actually test some return values (PVS-Studio). 2015-03-04 21:50:41 +09:00
Sebastian Lackner 68528519fc ddraw: Remove unused code for ChangeUniquenessValue. 2015-03-03 17:12:41 +09:00
Amine Khaldi 21bfc8c440 include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses. 2015-03-02 23:00:32 +09:00
Stefan Dösinger 5408c5ea34 ddraw/tests: Create a device in test_surface_discard. 2015-02-17 21:16:12 +09:00
Stefan Dösinger f64815e651 ddraw/tests: Port D3D1_ViewportClearTest to ddraw1.c (v2). 2015-02-17 21:16:08 +09:00
Stefan Dösinger 8c158c1e33 ddraw/tests: Port test_texturemapblend to ddraw2.c. 2015-02-16 23:26:18 +09:00
Stefan Dösinger c0efc3ebf8 ddraw/tests: Port D3D1_TextureMapBlendTest to ddraw1.c. 2015-02-16 23:26:06 +09:00
Stefan Dösinger f75d1b0c2f d3d/tests: Geforce8+ GPUs abs() table fog. 2015-02-13 22:37:07 +09:00
Stefan Dösinger 861ade434a ddraw/tests: Test rhw table fog z vs rhw. 2015-02-12 22:19:13 +09:00
Henri Verbeet ea534c9ab4 wined3d: Allow initial texture contents to be specified with wined3d_texture_create(). 2015-01-05 20:15:35 +01:00
Erich E. Hoover 3d5fe2074e ddraw: Fix inverted logic for enumerating secondary devices. 2014-12-11 16:41:05 +01:00
Henri Verbeet af9ccb490a ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create(). 2014-12-10 19:32:08 +01:00
Stefan Dösinger 19c860499a wined3d: Filter messages generated by focus handling. 2014-12-08 14:18:43 +01:00
Stefan Dösinger 262b9cc62e ddraw/tests: Test WM_SYSCOMMAND handling. 2014-12-08 14:18:38 +01:00
Stefan Dösinger bd91c559ae ddraw/tests: Fix window deactivation in test_coop_level_activateapp. 2014-12-08 14:18:36 +01:00
Stefan Dösinger 871fc4a38f d3d/tests: Rename fog_interpolation_test for consistency. 2014-11-27 13:27:24 +01:00
Stefan Dösinger 96519f9be9 d3d/tests: Table fog does not abs the fog coordinate. 2014-11-27 13:27:21 +01:00
Stefan Dösinger cfd741c6b6 d3d/tests: Show that the vfog abs is not a property of D3DFOG_LINEAR. 2014-11-27 13:27:17 +01:00
Stefan Dösinger c9b10beb36 wined3d: Vertex fog uses the absolute eye position z. 2014-11-27 13:27:13 +01:00
Stefan Dösinger f905c7c07a ddraw: Restore the registry display mode. 2014-11-20 22:31:39 +09:00
Stefan Dösinger 0edb13a20f ddraw/tests: Test messages on window reactivation. 2014-11-20 22:31:18 +09:00
Stefan Dösinger f6dde70624 wined3d: Restore the display mode on focus change. 2014-11-19 17:56:44 +09:00
Stefan Dösinger a9e0ece68a ddraw/tests: Test mode changes on focus loss and restore. 2014-11-19 16:41:11 +09:00
Stefan Dösinger a071587373 ddraw/tests: Test focus loss style changes. 2014-11-19 16:40:48 +09:00
Stefan Dösinger be01a7637d ddraw/tests: Test messages on focus loss. 2014-11-19 16:40:45 +09:00
Henri Verbeet 1c116c3527 d3d10core/tests: Port alpha_test() to d3d10core. 2014-11-17 19:30:40 +09:00
Francois Gouget 9006a013b0 ddraw/tests: Fix compilation on systems that don't support nameless unions. 2014-11-17 17:27:12 +09:00
Stefan Dösinger 38548df04b d3d/tests: Test fog interpolation. 2014-11-12 20:07:56 +09:00
Stefan Dösinger a6f7b213af ddraw/tests: Ddraw restores the mode settings from the registry. 2014-11-12 20:07:55 +09:00
Stefan Dösinger a04eb0c21b ddraw/tests: Rename modes and rectangles in test_coop_level_mode_set. 2014-11-12 20:07:55 +09:00
Stefan Dösinger 5d17f9bc7c ddraw/tests: Fix some COM macro versions in test_coop_level_mode_set. 2014-11-07 21:31:58 +09:00
Stefan Dösinger c436a525e4 ddraw/tests: Check if the current display settings match the registry settings. 2014-11-07 21:31:56 +09:00
Frédéric Delanoy 1e214eb5d3 Assorted spelling/grammar fixes. 2014-10-02 16:58:53 +02:00
Henri Verbeet 97856bcfee wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc(). 2014-09-29 10:37:35 +02:00
Henri Verbeet 5000eba6d0 ddraw: Set user memory in ddraw_surface_create() instead of ddraw_surface_init(). 2014-09-29 10:37:25 +02:00
Henri Verbeet e28800c6a4 ddraw: Move the pitch / linear size validation from ddraw_surface_init() to ddraw_surface_create(). 2014-09-29 10:37:22 +02:00
Francois Gouget 0dd5cb1cef Assorted spelling fixes. 2014-09-29 10:36:36 +02:00
Henri Verbeet 74ab8e8ce9 wined3d: Do not increment the reference count of the returned buffer in wined3d_device_get_stream_source().
None of the other getters increment the reference count either.
2014-09-18 13:06:32 +02:00
Henri Verbeet 07985a8c38 wined3d: Use rendertarget views for depth/stencil buffers instead of surfaces.
I don't think the difference between d3d10 depth/stencil and rendertarget
views is large enough to justify a separate type. Unfortunately that does make
the name "wined3d_rendertarget_view" slightly awkward.
2014-08-22 12:53:11 +02:00
Henri Verbeet b005ad6f90 wined3d: Use rendertarget views for color output instead of surfaces. 2014-08-21 12:24:42 +02:00
Stefan Dösinger 9bb5b00dd5 ddraw: Do not set lpSurface in GetSurfaceDesc.
This reverts a5c484cbf3. The test included
in a5c484cb is wrong and contains a typo that leads to incorrect
assumptions. The Dungeon Keeper 2 crash that was the reason for patch
a5c484cb is fixed properly by the previous patch.
2014-08-19 14:50:17 +02:00
Stefan Dösinger 61ee3323ad ddraw: Clear application-passed lpSurface pointers. 2014-08-19 14:50:12 +02:00
Henri Verbeet 1fb7ccdc13 ddraw: Clamp video memory to UINT_MAX in ddraw7_GetAvailableVidMem(). 2014-08-18 12:47:04 +02:00
Erich E. Hoover 45147b82ef ddraw: Return empty D3D hardware flags for RGB device enumeration. 2014-08-11 12:51:43 +02:00
Erich E. Hoover a56ea6e5d9 ddraw/tests: Remove broken tests of D3DTRANSFORM_UNCLIPPED. 2014-08-11 12:51:39 +02:00
Stefan Dösinger 341db6d8d3 wined3d: Remove wined3d_texture_set/get_priority. 2014-07-16 16:10:05 +02:00
Stefan Dösinger 2abecc46c6 wined3d: Remove wined3d_surface_set/get_priority. 2014-07-16 16:09:51 +02:00
Stefan Dösinger 8b367c7909 ddraw/tests: Add a test for IDirectDrawSurface7::SetPriority. 2014-07-16 16:09:27 +02:00
Stefan Dösinger 5b9f91c18d ddraw: Add validation to SetPriority / GetPriority. 2014-07-16 16:09:22 +02:00
Henri Verbeet ce60e4ec71 ddraw/tests: Get rid of struct sVertexT. 2014-07-15 15:29:55 +02:00
Henri Verbeet ee5e469fd8 ddraw/tests: Get rid of struct sVertex. 2014-07-15 15:29:53 +02:00
Stefan Dösinger 403d7c1dee ddraw: Refuse SetPalette and GetPalette on lost surfaces.
The SetPalette check is outside of ddraw_surface_set_palette to make
sure the palettes are properly freed when a lost P8 surface is destroyed.
2014-07-07 15:49:06 +02:00
Henri Verbeet 7447b37ff5 ddraw/tests: Get rid of struct nvertex. 2014-07-01 12:52:16 +02:00
Henri Verbeet ecf20e2630 ddraw/tests: Get rid of struct tvertex. 2014-07-01 12:52:13 +02:00
Henri Verbeet 3cf189af64 ddraw/tests: Get rid of struct vertex. 2014-07-01 12:52:11 +02:00
Henri Verbeet 8ebc82cd8d ddraw: Check for a lost surface in ddraw_surface7_Flip(). 2014-07-01 12:51:46 +02:00
Henri Verbeet 881219354f ddraw: Implement ddraw7_RestoreAllSurfaces(). 2014-06-30 22:04:53 +02:00
Henri Verbeet 8d4988a43f ddraw: Improve ddraw7_TestCooperativeLevel(). 2014-06-30 22:04:53 +02:00
Stefan Dösinger 9d49b7a9be wined3d: Set palettes on the swapchain. 2014-06-30 22:04:53 +02:00
Henri Verbeet 09fda3b805 d3d9: Improve d3d9_device_TestCooperativeLevel(). 2014-06-27 10:37:36 +02:00
Henri Verbeet 1b4c55df29 ddraw/tests: Add some lost device tests. 2014-06-27 10:37:33 +02:00
Frédéric Delanoy 2ab8729020 Assorted spelling/grammar fixes. 2014-06-20 12:19:31 +02:00
Henri Verbeet 9031adfd5c ddraw/tests: Properly declare matrices. 2014-06-16 14:00:16 +02:00
Henri Verbeet b9bfcf2c2a ddraw/tests: Get rid of some unused assignments. 2014-06-16 14:00:14 +02:00