Commit Graph

1735 Commits

Author SHA1 Message Date
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
Riccardo Bortolato 39549a54fc d3d9: Implement d3d9_device_UpdateSurface() on top of wined3d_device_copy_sub_resource_region().
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:08 +09:00
Matteo Bruni 4c1d6d27d0 d3d9: Return one quality level when the multisampling type isn't available.
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-27 23:35:32 +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 cf899ac267 wined3d: Rename WINED3D_RTYPE_VOLUME_TEXTURE to WINED3D_RTYPE_TEXTURE_3D.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-27 12:38:50 +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
Stefan Dösinger 062c0a90a2 d3d9/tests: Test invalid locks with textures.
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-20 21:18:15 +09:00
Stefan Dösinger 460ae01d98 d3d9/tests: Block validation checks the surface size too.
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-19 00:10:45 +09:00
Stefan Dösinger 48575df7cb wined3d: Block validation checks the surface size too.
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-19 00:10:42 +09:00
Józef Kucia 810423960d d3d9/tests: Add missing space to 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>
2016-01-09 17:30:04 +09:00
Józef Kucia 38d2d462df d3d9/tests: Add test for CreateDepthStencilSurfaceEx().
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-09 17:30:04 +09:00
Józef Kucia 89c6a755c4 d3d9: Implement d3d9_device_CreateDepthStencilSurfaceEx().
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-09 17:30:03 +09: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 e6e0c22783 wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 15:45:22 +01:00
Józef Kucia 574bce1b2b wined3d: Do not perform texture alpha blending for BUMPENV 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>
2016-01-05 11:51:34 +01:00
Stefan Dösinger 7cdb66a48b d3d9/tests: Use a slop for test_shademode.
Needed on my Geforce 7300. The old test passed OK, the newly extended
test needs a slop.

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:09 +01:00
Józef Kucia c3be8d748f d3d9/tests: Add tests for FFP texture 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>
2015-12-10 00:12:44 +09:00
Matteo Bruni 66d8e38ba4 wined3d: Handle D3DRS_SRGBWRITEENABLE in clears when ARB_framebuffer_sRGB is not 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>
2015-11-30 23:51:06 +09:00
Matteo Bruni 787a2716e1 wined3d: Respect D3DRS_SRGBWRITEENABLE in clears.
This only handles the case where ARB_framebuffer_sRGB and
EXT_texture_sRGB_decode are supported by the GL implementation.

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-30 23:51:05 +09:00
Vincent Povirk 7578bca0c0 d3d9/tests: Accept CURSOR_SUPPRESSED in cursor flags.
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-26 00:12:52 +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
Stefan Dösinger 04b41ade76 d3d9/tests: Multisampled render targets are zeroed on creation.
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-11-23 23:35:21 +09:00
Matteo Bruni 59d405b473 d3d9/tests: Improve the shade mode test.
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:05 +09:00
Józef Kucia b83beb18a2 d3d9: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}().
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>
2015-11-05 22:02:23 +09:00
Riccardo Bortolato 96dd793756 wined3d: Introduce wined3d_texture_release_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>
2015-10-28 22:31:29 +09:00
Riccardo Bortolato a2f2d238d4 wined3d: Introduce wined3d_texture_get_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>
2015-10-28 22:31:29 +09:00
Riccardo Bortolato 3e491662ba wined3d: Introduce wined3d_rendertarget_view_create_from_sub_resource().
Initial usage in d3d9.

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-28 22:31:28 +09:00
Henri Verbeet e855837abb d3d9/tests: Introduce a helper function to test for WARP.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-23 20:57:47 +09:00
Riccardo Bortolato 3b02ae89a8 d3d9: Replace wined3d_surface_get_render_target_data with wined3d_texture_blt in d3d9_device_GetRenderTargetData.
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-23 19:19:17 +09:00
Michael Stefaniuc 4fb840b614 d3d9/tests: Test the return value of CreateDepthStencilSurface().
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-22 23:34:48 +09:00
Riccardo Bortolato 1745c5f960 d3d9: In surface_init check for GetDC supported at texture level (avoid using a subresource).
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-22 17:31:58 +09:00
Riccardo Bortolato 46b717c509 d3d9: Avoid using a wined3d_surface in get_desc calls inside d3d9_device_StretchRect.
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-22 17:31:50 +09:00
Matteo Bruni 8075101480 d3d9/tests: Extend the shadow test a bit.
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-10-21 22:42:11 +09:00
Matteo Bruni d6e4064596 d3d9/tests: Extend the INTZ test a bit.
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-10-21 22:42:04 +09:00
Riccardo Bortolato 1da007e75d d3d9: Replace wined3d_surface_blt with wined3d_texture_blt in d3d9_device_StretchRect.
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-21 01:04:32 +09:00
Riccardo Bortolato f3c69e40dc d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill.
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-21 01:04:32 +09:00
Riccardo Bortolato 8f03c4413b d3d9: Replace wined3d_surface_preload with wined3d_texture_preload.
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-21 01:04:31 +09:00
Riccardo Bortolato 6671535dc3 wined3d: Make wined3d_device_set_cursor_properties work with wined3d_texture and sub_resource_index.
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-20 00:30:38 +09:00
Riccardo Bortolato 53f795af0a wined3d: Make wined3d_swapchain_get_front_buffer_data work with wined3d_texture and sub_resource_idx.
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-20 00:30:38 +09:00
Riccardo Bortolato 9875ad2cc3 d3d9: Call wined3d_swapchain_get_front_buffer_data instead of wined3d_device_get_front_buffer_data in d3d9_device_GetFrontBuffer.
Removed the now unused wined3d_device_get_front_buffer_data from wined3d.

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-20 00:30:38 +09:00
Henri Verbeet 51b9aba9cc d3d9: Simplify d3d9_device_CheckDeviceState().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-16 17:59:52 +09:00
Stefan Dösinger 59ec72879f wined3d: Remove wined3d_device_present.
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-10-15 19:20:29 +09:00
Nikolay Sivov 6c2bda6e33 d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-14 12:47:18 +09:00
Matteo Bruni f63386f43e d3d9/tests: Uninitialized varyings tests.
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-10-13 22:24:04 +09:00
Riccardo Bortolato 9b02e116bd d3d9: Don't use a wined3d_surface in d3d9_surface_GetDesc.
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 736ca38d11 d3d9: Make use of wined3d_texture_unmap in d3d9_surface_UnlockRect.
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 df1101ff68 d3d9: Make use of wined3d_texture_map in d3d9_surface_LockRect.
Also store wined3d_texture and sub_resource_idx in d3d9_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-10-12 23:34:56 +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
Matteo Bruni 742d4df55b d3d9/tests: Use the new readback helpers 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>
2015-10-12 22:09:56 +09:00
Matteo Bruni b8225d0a6a d3d9/tests: Add helpers to avoid multiple readbacks of the render target surface.
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-10-12 22:09:56 +09:00
Matteo Bruni 171352b901 d3d9/tests: Test uninitialized texture varyings with transformed vertices.
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-10-12 22:09:56 +09:00
Matteo Bruni 7ee0578019 d3d9/tests: Fix color_match().
Clang on OS X complains about calling abs() on an unsigned value.

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-10-08 21:00:38 +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 fca636a01c d3d9: Don't use a wined3d_volume in d3d9_volume_GetDesc.
finally removed the wind3d_volume pointer from d3d9_volume.
Also removed wined3d_volume_get_resource.

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 20:59:58 +09:00
Riccardo Bortolato 8dd86823fd d3d9: Make use of wined3d_texture_unmap in d3d9_volume_UnlockBox.
Also removed wined3d_volume_unmap from wined3d public api.

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 20:59:46 +09:00
Riccardo Bortolato b9cc2859fe d3d9: Make use of wined3d_texture_map in d3d9_volume_LockBox.
Also removed wined3d_volume_map from wined3d public api.

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 20:59:32 +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
Stefan Dösinger 178d0030a2 d3d9/tests: Port test_flip to d3d9.
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
2015-10-06 19:23:32 +09:00
Andrey Gusev 425160ce85 d3d9: TRACE fixes. 2015-09-18 14:57:38 +02:00
Gerald Pfeifer 601aa570f1 d3d9: Avoid shift overflow in render_state_test_data_init.
Same patch as just a minute ago, alas fro d3d9 instead of d3d8.

Gerald
2015-09-08 21:59:17 +09:00
Stefan Dösinger 2936e4ac54 wined3d: Remove wined3d_backbuffer_type. 2015-09-08 21:59:16 +09:00
Stefan Dösinger 2e8e2da5ee d3d9/tests: Test D3DBACKBUFFER_TYPE. 2015-09-08 21:59:16 +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 fc987aaaf6 d3d9/tests: Add more GetBackBuffer error handling tests. 2015-09-03 21:11:08 +09:00
Stefan Dösinger feb35006f5 wined3d: Remove wined3d_device_get_back_buffer. 2015-09-03 21:11:08 +09:00
Stefan Dösinger f010e5d88a wined3d: Return a texture from wined3d_swapchain_get_back_buffer. 2015-09-03 21:11:07 +09:00
Stefan Dösinger 0933332c73 d3d9/tests: Fix backbuffer read vs flip in test_vertex_blending. 2015-08-28 19:52:25 +09:00
Stefan Dösinger 9261bbb1a6 d3d9/tests: Test presentation parameter combinations. 2015-08-27 21:43:47 +09:00
Stefan Dösinger c4e4647ca5 d3d9: Validate swap effect and backbuffer count. 2015-08-27 21:43:46 +09:00
Stefan Dösinger 961f4c0a25 d3d9/tests: Mark testbot depth bias results broken. 2015-08-06 21:04:30 +09:00
Henri Verbeet 0c8e78f80d d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces. 2015-08-04 12:21:58 +02:00
Stefan Dösinger 571462c633 d3d9/tests: Add a depth bias test. 2015-07-30 23:51:22 +02:00
Matteo Bruni 68e2503965 d3d9/tests: Don't call SetVertexShaderConstantF if vertex shaders aren't supported.
Also slightly change attenuation factors to try to stay away from the
(possible) implementation max size of 64.
2015-07-29 20:56:37 +02:00
Matteo Bruni 149b1549be d3d9/tests: Fix caps check in texdepth_test(). 2015-07-29 20:56:35 +02:00
Matteo Bruni 76b1461d17 d3d9/tests: Add a test for UpdateTexture. 2015-07-09 17:18:22 +09:00
Józef Kucia 399cf7e4b9 d3d9/tests: Add basic tests for vertex blending. 2015-07-03 16:51:39 +09:00
Matteo Bruni 170dca7741 wined3d: Handle per-vertex point size in the GLSL FFP replacement. 2015-06-17 20:01:19 +09:00
Matteo Bruni 4611ad8bef d3d9/tests: Test the default colors for fixed function vertex processing. 2015-06-12 21:23:12 +09:00
Matteo Bruni 3c7e48a132 d3d9/tests: Test the default diffuse color for vertex shaders. 2015-06-12 21:23:12 +09:00
Matteo Bruni 81935797a1 d3d9/tests: Add a test for reordering texture coordinates via D3DTSS_TEXCOORDINDEX. 2015-06-11 19:34:54 +09:00
Stefan Dösinger 4d8bfe190c d3d9/tests: Test multisample mismatch. 2015-06-10 23:25:05 +09:00
Matteo Bruni 386b5ded61 d3d9/tests: Add more tests for point size. 2015-06-05 16:52:54 +09:00
Stefan Dösinger 87bf9c99b8 d3d9/tests: Avoid invalid framebuffer configrations in resz_test. 2015-05-19 22:56:05 +09:00
Matteo Bruni 40ce3d16e8 d3d9/tests: Add spotlight and light range tests. 2015-04-29 17:02:16 +09:00
Sebastian Lackner cf9c3fed18 d3d9/tests: Fix compile error with gcc 4.9. 2015-04-28 15:36:21 +09:00
Stefan Dösinger 7109bebd02 wined3d: Move volume DXTn handling to apply_format_fixups. 2015-04-27 15:07:42 +09:00
Matteo Bruni 1e494a69c1 d3d9/tests: Add a specular lighting test. 2015-04-24 19:08:04 +09:00
Matteo Bruni b963c73abb wined3d: Introduce D3D7+ normal matrix computation. 2015-04-24 19:07:52 +09:00
Matteo Bruni 92cb56a2f8 d3d9/tests: Add a lighting test with non-affine worldview matrix. 2015-04-22 23:23:57 +09:00
Henri Verbeet ca00d72da3 d3d9/tests: Release "d3d9ex" after we're done with it in test_wndproc() (Valgrind). 2015-04-21 22:21:48 +09:00
Henri Verbeet dc53f6c2e6 wined3d: Use the display format if WINED3DFMT_UNKNOWN is passed as backbuffer format for windowed mode resets. 2015-04-15 22:21:58 +09:00
Henri Verbeet 3ccac1a71f d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset. 2015-04-14 17:26:44 +09:00
Henri Verbeet c78312ad08 d3d9: Merge most of d3d9_device_Reset() and d3d9_device_ResetEx(). 2015-04-14 17:26:42 +09:00
Henri Verbeet af438d451c d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset. 2015-04-14 17:26:36 +09:00
Henri Verbeet f35cc97911 d3d10core/tests: Port the d3d9 vPos test to d3d10. 2015-03-31 18:49:28 +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
Matteo Bruni 2f710d72bb d3d9/tests: Add more lighting tests. 2015-03-27 20:40:38 +09:00
Henri Verbeet 1b08196c5a wined3d: Implement d3d10 style instance data step rates. 2015-03-24 17:41:06 +09:00
Henri Verbeet 88f230b56e d3d10core: Also pass unused input layout elements to wined3d.
While these won't be used by the shader, they potentially affect the
calculated offset for WINED3D_APPEND_ALIGNED_ELEMENT elements.
2015-03-23 22:59:12 +09:00
Francois Gouget f505e6fb4a Assorted spelling fixes. 2015-03-19 21:54:14 +09:00
Stefan Dösinger 462346ac83 d3d9/tests: Extend the colorfill test. 2015-03-18 21:03:38 +09:00
Stefan Dösinger c5fdc1670b d3d9/tests: Relax the fog range test a bit. 2015-03-13 22:28:29 +09:00
Stefan Dösinger d25cc9695b d3d9: Correct ColorFill validation. 2015-03-13 21:57:33 +09:00
Stefan Dösinger cdb7e825ce d3d9/tests: Add a test for signed formats. 2015-03-10 21:43:28 +09:00
Michael Stefaniuc 3730c99c28 d3d9/tests: Remove no-op binary & with all 1's (PVS-Studio). 2015-03-06 20:32:05 +09:00
Michael Stefaniuc 148d6e3c10 d3d9/tests: Actually test some return values (PVS-Studio). 2015-03-04 21:50:41 +09:00
Stefan Dösinger 28a9d6324a d3d9/tests: Extend the FPU setup test.
Games created by GameMaker modify the FPU control word to enable
division by zero exceptions. The game Risk of Rain, which is written
with GameMaker, furthermore sets fogstart == fogend, which triggers an
exception when the GL driver attempts to calculate 1 / (fogend -
fogstart). This test adds some evidence that we are not supposed to
temporarily restore the FPU CW if D3DCREATE_FPU_PRESERVE is used.
2015-02-27 21:53:33 +09:00
Matteo Bruni d423e06223 d3d9/tests: Move a Present out of the loops in fog_with_shader_test(). 2015-02-20 22:53:23 +09:00
Matteo Bruni acbb387753 d3d9/tests: Test upload of user memory textures. 2015-02-20 22:53:19 +09:00
Matteo Bruni 2aed2c3a15 d3d9/tests: Allow more alternative results in the ATI1N test. 2015-02-19 17:51:20 +09:00
Stefan Dösinger f75d1b0c2f d3d/tests: Geforce8+ GPUs abs() table fog. 2015-02-13 22:37:07 +09:00
Stefan Dösinger fd218b93d0 d3d9/tests: Test rhw depth clip with z enabled but no depth buffer set. 2015-02-12 22:19:48 +09:00
Stefan Dösinger 3b2c642163 d3d9/tests: Test rhw table fog z vs rhw.
The Z disable part of the test is technically not necessary because the
fog coordinate is written before applying the projection matrix. I've
nevertheless included it because this is not immediately obvious and fog
is the only place where the vertex Z matters if depth test and depth
clipping are disabled.
2015-02-12 22:19:02 +09:00
Matteo Bruni 30f4d91906 d3d9/tests: Add a test for POSITIONi shader input/outputs. 2015-02-09 22:05:53 +09:00
Stefan Dösinger 63d52c7317 d3d/tests: Show that WM_SYSCOMMAND(SC_RESTORE) is delivered only once. 2015-01-28 11:06:56 +01:00
Stefan Dösinger 3ef1d6bcd9 wined3d: Pass WM_SYSCOMMAND(SC_RESTORE) to DefWindowProc. 2015-01-28 11:06:48 +01:00
Axel Davy b83825509e d3d9/tests: Fix test_3dc_formats getPixelColor check.
getPixelColor should be called before Present, because the device
swapchain was created with discard mode.
2015-01-08 14:03:15 +01:00
Axel Davy fc84368f87 d3d9/tests: Fix volume_dxt5_test getPixelColor check.
getPixelColor should be called before Present, because the device
swapchain was created with discard mode.
2015-01-08 14:03:06 +01:00
Matteo Bruni 6f89df2fb4 d3d9/tests: Remove a couple duplicate lines. 2015-01-06 12:34:07 +01:00
Henri Verbeet ea534c9ab4 wined3d: Allow initial texture contents to be specified with wined3d_texture_create(). 2015-01-05 20:15:35 +01:00
Michael Stefaniuc 51406b471a d3d9: Don't assert for shaders with the wrong vtbl. 2014-12-16 11:39:40 +01:00
Henri Verbeet 3b3b74510b d3d9: Calculate texture levels in d3d9 instead of wined3d. 2014-12-10 19:32:15 +01:00
Stefan Dösinger 19c860499a wined3d: Filter messages generated by focus handling. 2014-12-08 14:18:43 +01:00
Stefan Dösinger f217636e2d d3d9/test: Test WM_SYSCOMMAND handling. 2014-12-08 14:17:22 +01:00
Stefan Dösinger 0c55b9d2b3 d3d9/tests: Test focus loss message filtering in d3d9ex. 2014-12-08 14:17:13 +01:00
Stefan Dösinger 36553d862b d3d9/tests: Test focus loss message filtering. 2014-12-08 14:17:09 +01:00
Stefan Dösinger aa9bc4c509 d3d9: Refuse to reset a lost device. 2014-12-02 13:05:48 +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
Alexandre Julliard 099bc21df7 d3d9/tests: Don't require a WM_MOVE message. 2014-11-26 20:40:49 +01:00
Stefan Dösinger abf44708a4 d3d9/tests: Fix test_cursor(). 2014-11-25 19:49:42 +01:00
Stefan Dösinger 8b6a7a9c02 d3d9: Only one fullscreen swapchain is allowed. 2014-11-25 19:49:30 +01:00
Stefan Dösinger f4d520d6e2 wined3d: Don't minimize hidden windows. 2014-11-20 22:31:26 +09:00
Stefan Dösinger 09a91231a6 wined3d: Set the device window size on focus window activation. 2014-11-20 22:31:13 +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 1851e2618b d3d9/tests: Test mode restoration on focus loss. 2014-11-19 16:41:03 +09:00
Stefan Dösinger ef60604d44 d3d9/tests: Test style changes on focus loss. 2014-11-18 14:14:37 +09:00
Stefan Dösinger 9bcd9722f1 d3d9/tests: Test messages on focus loss. 2014-11-18 14:14:32 +09:00
Henri Verbeet 1c116c3527 d3d10core/tests: Port alpha_test() to d3d10core. 2014-11-17 19:30:40 +09:00
Stefan Dösinger 32450ee61d d3d9/tests: Allow passing a resolution to reset_device in d3d9ex. 2014-11-12 20:07:56 +09:00
Stefan Dösinger 38548df04b d3d/tests: Test fog interpolation. 2014-11-12 20:07:56 +09:00
Stefan Dösinger 6ad7d50958 d3d9/tests: Allow passing a resolution to reset_device. 2014-11-11 21:57:27 +09:00
Stefan Dösinger 5e369853f1 d3d9/tests: Fix some wndproc comparison error messages. 2014-11-11 21:57:19 +09:00
Stefan Dösinger 7fb22f502e d3d9/tests: The device restores the mode settings from the registry. 2014-11-07 14:04:00 +09:00
Stefan Dösinger 40c2fc215d d3d9/tests: Check if the current display settings match the registry settings. 2014-11-04 21:16:13 +09:00
Matteo Bruni d690aaeeb6 d3d9/tests: Add an ATI1N entry to the test_volume_blocks test. 2014-11-04 21:15:59 +09:00
Matteo Bruni da54670a94 d3d9/tests: Add a test for ATI1N and ATI2N texture formats. 2014-11-04 21:15:58 +09:00
Henri Verbeet 875a7c5426 wined3d: Use the input signature to setup SM4 pixel shader input semantics. 2014-11-04 16:54:35 +09:00
Stefan Dösinger 6334bf09b7 d3d9/tests: Skip unsupported resources in test_resource_type. 2014-10-23 18:48:20 +09:00
Stefan Dösinger 8633f7f123 d3d9/tests: Use create_device for test_swvp_buffer. 2014-10-22 21:01:39 +09:00
Stefan Dösinger d5b2e8af39 d3d9/tests: Use create_device in test_fpu_setup (v2). 2014-10-22 21:01:35 +09:00
Stefan Dösinger ee0733863e d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES. 2014-10-21 18:47:42 +09:00
Stefan Dösinger 80cbd276e0 d3d9/tests: Port test_window_style to d3d9ex. 2014-10-17 15:50:11 +09:00
Stefan Dösinger 5c33ffaf67 d3d9/tests: Port wndproc tests to d3d9ex. 2014-10-17 15:50:04 +09:00
Matteo Bruni 894298d502 d3d9/tests: Port the unsupported shaders test to D3D9Ex. 2014-10-16 21:23:07 +09:00
Stefan Dösinger a426d335a4 d3d9/tests: Allow a width and height to be passed to create_device() in the d3d9ex tests. 2014-10-15 21:29:29 +09:00
Matteo Bruni d897db7605 d3d9/tests: Add some tests for shaders using more than the maximum number of supported constants. 2014-10-14 14:00:50 +09:00
Henri Verbeet 1bec6ab0bc d3d9/tests: Use create_device() in test_scissor_size(). 2014-10-09 17:36:22 +02:00
Henri Verbeet 2291c72caf d3d9/tests: Allow a width and height to be passed to create_device(). 2014-10-09 17:36:22 +02:00
Stefan Dösinger 537febf2e8 d3d9/tests: Don't load user32 functions at runtime. 2014-10-07 20:22:08 +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 a3daed9604 d3d10core: Implement d3d10_device_GetPredication(). 2014-09-19 10:49:24 +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 736b9e1c1c wined3d: Get rid of wined3d_device_color_fill(). 2014-08-22 12:53:26 +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
Henri Verbeet 888b278096 d3d9: wined3d_device_get_available_texture_mem() returns a UINT. 2014-08-18 12:47:10 +02:00
Henri Verbeet d1d48d3194 d3d9: The "forwardReference" field in struct d3d9_surface is always a texture, if set. 2014-08-18 12:47:01 +02:00
Henri Verbeet c5e8115ee2 d3d9: Volumes are always part of a texture. 2014-08-15 17:04:10 +02:00
Henri Verbeet ff694bf47d d3d9: Return E_OUTOFMEMORY on HeapAlloc() failure in device_parent_surface_created(). 2014-08-15 17:04:03 +02:00
Stefan Dösinger 341db6d8d3 wined3d: Remove wined3d_texture_set/get_priority. 2014-07-16 16:10:05 +02:00
Stefan Dösinger cf11933701 wined3d: Remove wined3d_buffer_set/get_priority. 2014-07-16 16:10:01 +02:00
Henri Verbeet 30437f9fe4 d3d9/tests: Get rid of struct vertex_floatcolor. 2014-07-16 11:56:01 +02:00
Henri Verbeet 0cae65d494 d3d9/tests: Get rid of struct vertex_shortcolor. 2014-07-16 11:55:59 +02:00
Henri Verbeet 1ccf7f5e74 d3d9/tests: Get rid of struct nvertex. 2014-07-16 11:55:57 +02:00
Henri Verbeet 86ba5b604e d3d9/tests: Get rid of struct tvertex. 2014-07-16 11:55:55 +02:00
Henri Verbeet 51f5bc903a d3d9/tests: Get rid of struct vertex. 2014-07-16 11:55:52 +02:00
Stefan Dösinger 9329e996b4 d3d9/tests: Fix some ok() call style issues. 2014-07-09 14:43:56 +02:00
Stefan Dösinger 509c49bdb5 d3d9/tests: Add a test for SetPriority and GetPriority. 2014-07-09 14:43:40 +02:00
Stefan Dösinger eb0daf08c6 d3d9: Ignore SetPriority and GetPriority calls on surfaces. 2014-07-09 14:43:30 +02:00
Henri Verbeet ae25b1eca5 d3d9: Improve d3d9_device_CheckDeviceState() a little. 2014-06-30 22:04:53 +02:00
Henri Verbeet d50350886a d3d9: Check the device status in present calls. 2014-06-27 10:37:39 +02:00
Henri Verbeet 09fda3b805 d3d9: Improve d3d9_device_TestCooperativeLevel(). 2014-06-27 10:37:36 +02:00
Henri Verbeet 04acac207a d3d9/tests: Add some lost device tests. 2014-06-27 10:37:23 +02:00
Matteo Bruni b42fe709d6 wined3d: Validate and handle query size parameter. 2014-06-16 13:56:35 +02:00