ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
116,049 Commits 3 Branches 0 Tags 575 MiB
Commit Graph

463 Commits

Author SHA1 Message Date
Józef Kucia 82d21786cd d3d11: Implement d3d10_device_ClearDepthStencilView(). 
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:46:04 +09:00
Józef Kucia 526c4612c8 d3d11: Implement d3d11_immediate_context_ClearDepthStencilView(). 
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:46:00 +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
Józef Kucia f1c58a93af d3d11: Translate WINED3DERR_INVALIDCALL to E_INVALIDARG in d3d_texture{2d, 3d}_init(). 
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:34 +09:00
Józef Kucia d6bef36f22 d3d11/tests: Add more create texture 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>
 2016-03-15 22:45:30 +09:00
Józef Kucia 75c9178c98 d3d11/tests: Move typeless textures test to test_create_texture{2d, 3d}(). 
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:27 +09:00
Józef Kucia 37954777d5 d3d11/tests: Trace feature level. 
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-14 22:24:43 +09:00
Józef Kucia fa690f6be2 d3d11/tests: Drop redundant feature level check. 
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-11 20:23:41 +09:00
Matteo Bruni 1c8983bf75 d3d11/tests: Test creating SM4 shaders on feature level 9. 
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-11 20:23:15 +09:00
Matteo Bruni 73c32df383 d3d11/tests: Add a test for the default feature level selection. 
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-11 20:23:13 +09:00
Matteo Bruni ce32dccee7 d3d11: Pass the requested feature levels to dxgi. 
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-11 20:23:11 +09:00
Matteo Bruni ca3963b674 d3d11: Only accept shader versions supported by the feature level of the device. 
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-11 20:23:08 +09:00
Matteo Bruni 1e77bb01db d3d11: Implement device_GetFeatureLevel(). 
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-11 20:23:05 +09:00
Matteo Bruni ffce30bc31 dxgi: Add feature level 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>
 2016-03-11 20:23:02 +09:00
Matteo Bruni 9da6dd2ac9 d3d11/tests: Require feature level 11_0 or 10_0 by default. 
Otherwise D3D11CreateDevice() might fallback to feature level 9 and the
current tests can't handle (nor are interested in) that.

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-09 22:17:00 +09:00
Józef Kucia c5bacb66dd d3d11/tests: Introduce draw_quad(). 
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-08 11:11:04 +09:00
Józef Kucia 57a15f2fd7 d3d11/tests: Introduce d3d11_test_context for visual 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>
 2016-03-08 11:11:02 +09:00
Józef Kucia aac8805ec2 d3d11/tests: Add test for creating DSV with DXGI_FORMAT_UNKNOWN. 
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-08 11:11:00 +09:00
Józef Kucia e70b63fa84 d3d11/tests: Add test for creating RTV with DXGI_FORMAT_UNKNOWN. 
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-08 11:10:55 +09:00
Józef Kucia aa817a85cb d3d11/tests: Remove unnecessary explicit array sizes. 
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-04 20:55:24 +09:00
Józef Kucia cd8be0b431 d3d11: Trace actual swapchain pointer in D3D11CreateDeviceAndSwapChain(). 
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-04 20:55:03 +09:00
Józef Kucia c7d18b39a9 d3d11/tests: Add test for creating SRV with DXGI_FORMAT_UNKNOWN. 
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-04 20:54:58 +09:00
Józef Kucia 012b282ffa d3d11: Sync formats with dxgi. 
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-04 20:54:55 +09:00
Józef Kucia b6f622c461 d3d11: Recognize more BGR 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-03-03 22:29:06 +09:00
Józef Kucia 53716ba8cb d3d11/tests: Add test for DXGI_FORMAT_BC5_UNORM format. 
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-03 22:29:05 +09:00
Józef Kucia 9447ce4312 d3d11/tests: Add test for DXGI_FORMAT_BC4_UNORM format. 
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-03 22:29:05 +09:00
Józef Kucia 0ac8dd6976 d3d11/tests: Introduce check_texture_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-03-02 23:30:37 +09:00
Józef Kucia 25f9fbcc6d d3d11/tests: Add test for multiple render targets. 
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-02 23:30:34 +09:00
Józef Kucia 4aaf13359c d3d11/tests: Test creation of level_9_* shaders. 
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-12 23:07:30 +09:00
Józef Kucia 6ef3324fd8 d3d11: Extract SM5 shader code from DXBC. 
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-12 23:07:29 +09:00
Józef Kucia b9f1b0fff8 d3d11: Do not generate ERR messages for unrecognized shader bytecode. 
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-12 23:07:29 +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 e71f35fc72 d3d11/tests: Test creation of typeless 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-02-11 01:26:47 +09:00
Józef Kucia b7a3d1f03e d3d11/tests: Add test for sRGB 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-02-09 00:37:25 +09:00
Józef Kucia e6b7ad8e45 d3d11: Enable sRGB decode. 
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 b6f57778a5 d3d11/tests: Test the creation of textures 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-02-05 20:35:07 +09:00
Matteo Bruni 3ba7043b54 d3d11/tests: Add a test for 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:05 +09:00
Matteo Bruni 3d95b4c79d d3d11: Implement d3d10_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:03 +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
Józef Kucia b1ee60f22f d3d11: Rename WINE_D3D10_TO_STR to WINE_D3D_TO_STR. 
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-05 00:21:58 +09:00
Józef Kucia f972350678 d3d11/tests: Add test for SM4 sample_b instruction. 
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-03 21:57:09 +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
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
Józef Kucia 2fb789931f d3d11/tests: Add test for integer 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-26 22:32:41 +09:00
Józef Kucia c161543c86 d3d11/tests: Add test for ID3D11DeviceContext::CopySubresourceRegion(). 
Based on test_update_subresource().

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-22 01:26:18 +09:00
Riccardo Bortolato ccbe3a580b d3d11: Implement d3d11_immediate_context_CopySubresourceRegion(). 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
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-22 01:26:17 +09:00
Riccardo Bortolato aa472ac67a d3d11: Handle NULL source box in d3d10_device_CopySubresourceRegion(). 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
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-22 01:26:17 +09:00
Józef Kucia 8330635c93 d3d11/tests: Extend test for ID3D11DeviceContext::UpdateSubresource(). 
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-20 21:18:46 +09:00
Józef Kucia 13f84a4b68 d3d11/tests: Add test for SM4 resinfo instruction. 
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-19 00:11:00 +09:00
Stefan Dösinger 616e965789 d3d11/tests: Multisampled render targets are zeroed on creation. 
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-12 16:03:20 +09:00
Józef Kucia 334081882b d3d11/tests: Add test for block-compressed 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-08 21:36:26 +09:00
Józef Kucia 5be262565e d3d11/tests: Add test for SM4 ld instruction. 
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-06 18:08:37 +01:00
Józef Kucia ab79239aa8 d3d11/tests: Add test for SM4 sample_l instruction. 
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:09 +01:00
Francois Gouget 413c6f60cf Assorted spelling fixes. 
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-02 12:59:52 +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
Alistair Leslie-Hughes e7de17fce8 d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState(). 
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.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
Józef Kucia cd525dda2a d3d11: Implement d3d11_immediate_context_RSGetViewports(). 
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-16 22:40:11 +09:00
Józef Kucia 860433c79a d3d11: Implement d3d11_immediate_context_OMGetRenderTargets(). 
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-13 22:54:49 +09:00
Józef Kucia ea7c30e831 d3d11: Implement d3d11_immediate_context_DrawIndexedInstanced(). 
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-13 22:54:46 +09:00
Józef Kucia f282e10e00 d3d11: Implement d3d11_immediate_context_DrawIndexed(). 
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-13 22:54:43 +09:00
Józef Kucia a277a9c4bf d3d11: Implement d3d11_immediate_context_IASetIndexBuffer(). 
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-13 22:54:40 +09:00
Józef Kucia efbd056e35 d3d11: Implement d3d11_immediate_context_SOGetTargets(). 
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-12 22:17:05 +09:00
Józef Kucia 4b281147e1 d3d11: Implement d3d11_immediate_context_SOSetTargets(). 
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-12 22:17:04 +09:00
Józef Kucia cf2c41e873 d3d11: Implement d3d11_immediate_context_PSGetConstantBuffers(). 
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-12 22:17:04 +09:00
Józef Kucia 8f212a21ed d3d11: Implement d3d11_immediate_context_PSGetShader(). 
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-12 22:17:04 +09:00
Józef Kucia fe4ba036f6 d3d11: Implement d3d11_immediate_context_PSGetShaderResources(). 
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-12 22:17:04 +09:00
Józef Kucia a6aabcbc37 d3d11: Implement d3d11_immediate_context_VSGetShaderResources(). 
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-12 22:17:04 +09:00
Józef Kucia 3804746de1 d3d11: Implement d3d11_immediate_context_VSGetShader(). 
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-12 22:17:03 +09:00
Józef Kucia 1f0236bd6d d3d11: Implement d3d11_immediate_context_VSGetConstantBuffers(). 
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-12 22:17:03 +09:00
Józef Kucia 9e18cfacb2 d3d11: Implement d3d11_immediate_context_GSGetShaderResources(). 
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-12 22:17:03 +09:00
Józef Kucia e7377e6f2d d3d11: Implement d3d11_immediate_context_GSGetShader(). 
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-12 22:17:03 +09:00
Józef Kucia 58aa9d4108 d3d11: Implement d3d11_immediate_context_GSGetConstantBuffers(). 
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-12 22:17:03 +09:00
Józef Kucia aca6aa7ebf d3d11: Implement d3d11_immediate_context_GSGetSamplers(). 
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-12 22:17:03 +09:00
Józef Kucia f4e4d7b0b1 d3d11/tests: Avoid multiple readbacks of backbuffer texture. 
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-12 22:17:03 +09:00
Józef Kucia 60112f42ad d3d11: Implement d3d11_immediate_context_PSGetSamplers(). 
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-10 19:42:04 +09:00
Józef Kucia cf9f647318 d3d11: Implement d3d11_immediate_context_VSGetSamplers(). 
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-10 19:42:02 +09:00
Józef Kucia e427f6125b d3d11: Implement d3d11_immediate_context_GetPredication(). 
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-10 19:41:59 +09:00
Józef Kucia 8daf9a65f6 d3d11: Implement 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>
 2015-11-10 19:41:57 +09:00
Józef Kucia e013179f9e d3d11: Implement d3d11_immediate_context_IAGetInputLayout(). 
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-10 19:41:55 +09:00
Józef Kucia 73dba1a946 d3d11: Implement d3d11_immediate_context_RSGetState(). 
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-10 19:41:52 +09:00
Józef Kucia 53751bcc5d d3d11: Implement d3d11_immediate_context_GSSetSamplers(). 
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-10 19:41:50 +09:00
Józef Kucia 099b7f549f d3d11: Implement d3d11_immediate_context_VSSetSamplers(). 
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-10 19:41:47 +09:00
Józef Kucia 9b245ff05f d3d11: Implement d3d11_immediate_context_VSSetShaderResources(). 
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-10 19:41:44 +09:00
Józef Kucia a2f48cc854 d3d11: Implement d3d11_immediate_context_VSSetConstantBuffers(). 
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-10 19:41:42 +09:00
Józef Kucia 807e019da9 d3d11: Implement d3d11_immediate_context_IAGetPrimitiveTopology(). 
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-10 19:41:38 +09:00
Józef Kucia 6dc3a0117d d3d11: Implement d3d11_immediate_context_GSSetShaderResources(). 
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-09 23:10:08 +09:00
Józef Kucia 38ef285262 d3d11: Implement d3d11_immediate_context_GSSetConstantBuffers(). 
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-09 23:10:08 +09:00
Józef Kucia 294b172a9e d3d11/tests: Port test_update_subresource() from d3d10core. 
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-09 23:10:07 +09:00
Józef Kucia 2038605030 d3d11: Implement d3d11_immediate_context_UpdateSubresource(). 
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-09 23:10:07 +09:00
Józef Kucia a74d3ed212 d3d11/tests: Port test_fragment_coords() from d3d10core. 
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-09 23:10:07 +09:00
Józef Kucia 9b7737ac06 d3d11: Implement d3d11_immediate_context_PSSetConstantBuffers(). 
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-09 23:10:07 +09:00
Józef Kucia 28110c1217 d3d11/tests: Port test_texture() from d3d10core. 
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-09 23:10:07 +09:00
Józef Kucia b62720feb6 d3d11: Implement d3d11_immediate_context_PSSetShaderResources(). 
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-09 23:10:07 +09:00
Józef Kucia f175b23665 d3d11: Implement d3d11_immediate_context_PSSetSamplers(). 
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-09 23:10:06 +09:00
Józef Kucia c3e48c9b19 d3d11/tests: Port test_blend() from d3d10core. 
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-06 16:24:34 +09:00
Józef Kucia f1ca5038b2 d3d11: Implement d3d11_immediate_context_OMSetBlendState(). 
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-06 16:24:32 +09:00
Józef Kucia 6e22a5d69f d3d11/tests: Port test_scissor() from d3d10core. 
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-06 16:24:29 +09:00
Józef Kucia 95998504bd d3d11: Implement d3d11_immediate_context_RSSetState(). 
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-06 16:24:27 +09:00
Józef Kucia d42714814d d3d11: Implement d3d11_immediate_context_RSSetScissorRects(). 
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-06 16:24:25 +09:00
Józef Kucia 680b67e409 d3d11: Implement d3d11_immediate_context_Draw(). 
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-06 16:24:22 +09:00
Józef Kucia bcb809ce59 d3d11: 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:29 +09:00
Józef Kucia 0d9732a9b5 d3d11/tests: Port test_il_append_aligned() from d3d10core. 
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:13 +09:00
Józef Kucia fa05d30dc5 d3d11: Implement d3d11_immediate_context_OMSetRenderTargets(). 
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:08 +09:00
Józef Kucia c390d78618 d3d11: Implement d3d11_immediate_context_RSSetViewports(). 
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:03 +09:00
Józef Kucia 7fbf33f1a4 d3d11/tests: Add test for resource mapping. 
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:01:58 +09:00
Józef Kucia 1c980f7093 d3d11: Add support for mapping 3D 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>
 2015-11-05 22:01:49 +09:00
Józef Kucia 825c675ebe d3d11: Implement d3d11_immediate_context_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-04 14:41:37 +09:00
Józef Kucia 75db69ad02 d3d11: Implement d3d11_immediate_context_Map(). 
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-04 14:41:37 +09:00
Józef Kucia 63b120234e d3d11/tests: Port test_create_predicate() from d3d10core. 
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-10-27 21:42:43 +09:00
Józef Kucia bd1bb06d84 d3d11: Implement d3d11_device_CreateQuery(). 
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-10-27 21:42:35 +09:00
Józef Kucia e958d49b06 d3d11: Implement d3d11_device_CreatePredicate(). 
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-10-27 21:42:32 +09:00
Józef Kucia d86ee74b80 d3d11: Add ID3D11Query interface stub. 
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-10-27 21:42:29 +09:00
Józef Kucia 9ea84e251d d3d11: Rename d3d10_query to d3d_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>
 2015-10-27 21:42:26 +09:00
Francois Gouget 26c5fcd007 d3d11: Make impl_from_ID3D11ShaderResourceView() static. 
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-27 21:42:20 +09:00
Józef Kucia 8b0b82a580 d3d/tests: Check that device implements IDXGIDevice1. 
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-10-26 23:03:37 +09:00
Józef Kucia 3f280dd20c d3d11: Implement d3d11_immediate_context_CopyResource(). 
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-10-23 19:19:51 +09:00
Józef Kucia 5b225953c9 d3d11: Implement d3d11_immediate_context_IASetVertexBuffers(). 
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-10-23 19:19:45 +09:00
Józef Kucia 1960ca5de8 d3d11: Implement d3d11_immediate_context_GSSetShader(). 
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-10-23 19:19:40 +09:00
Józef Kucia 1861131090 d3d11: Do not store ID3D11Device pointer in d3d11_immediate_context. 
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-10-23 19:19:34 +09:00
Józef Kucia b6462c18da d3d11/tests: Add test for ID3D11Device parents. 
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-10-22 17:32:33 +09:00
Józef Kucia 22c28d9f5c d3d11: Use CreateDXGIFactory1 to create factory in D3D11CreateDevice. 
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-10-22 17:32:30 +09:00
Józef Kucia 7e4453c4fb d3d11: Remove outdated FIXME comment. 
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-10-22 17:32:27 +09:00
Józef Kucia 5323dd8836 d3d11/tests: Check that blend states implement ID3D10BlendState. 
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-10-21 01:04:34 +09:00
Józef Kucia 8c6faa29a5 d3d11: Implement d3d10_device_CreateBlendState1(). 
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-10-21 01:04:33 +09:00
Józef Kucia 0912adee67 d3d11: Implement ID3D10BlendState1 interface. 
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-10-21 01:04:33 +09:00
Józef Kucia b90215f350 d3d11: Implement d3d10_device_CreateShaderResourceView1(). 
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-10-21 01:04:32 +09:00
Józef Kucia 64e02271c1 d3d11/tests: Check that shader resource views implement ID3D10ShaderResourceView1. 
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-10-20 00:30:39 +09:00
Józef Kucia 6c96e0ac77 d3d11: Implement ID3D10ShaderResourceView1 interface. 
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-10-20 00:30:39 +09:00
Józef Kucia 3b54ec6a34 d3d11: Implement d3d11_immediate_context_DrawInstanced(). 
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-10-15 19:20:07 +09:00
Józef Kucia 1b9ce7671e d3d11: Implement d3d11_immediate_context_ClearRenderTargetView(). 
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-10-15 19:20:04 +09:00
Józef Kucia acd78b54c0 d3d11: Partially implement d3d11_immediate_context_PSSetShader(). 
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-10-15 19:20:02 +09:00
Józef Kucia d53c5020c3 d3d11: Partially implement d3d11_immediate_context_VSSetShader(). 
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-10-15 19:19:58 +09:00
Józef Kucia 5ff257f226 d3d11: Implement d3d11_immediate_context_IASetInputLayout(). 
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-10-15 19:19:55 +09:00
Józef Kucia 6d984251af d3d11: Implement d3d11_immediate_context_IASetPrimitiveTopology(). 
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-10-15 19:19:52 +09:00
Józef Kucia 1275375ef8 d3d11/tests: Port test_create_sampler_state() from d3d10core. 
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-10-13 23:35:22 +09:00
Józef Kucia 48b13fe2bc d3d11: Implement d3d11_device_CreateSamplerState(). 
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-10-13 22:25:18 +09:00
Józef Kucia 702e536ca4 d3d11: Implement d3d11_sampler_state_GetDesc(). 
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-10-13 22:25:15 +09:00
Józef Kucia 038cb1a691 d3d11: Implement ID3D11SamplerState interface. 
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-10-13 22:25:13 +09:00
Józef Kucia 4270030c8b d3d11: Rename d3d10_sampler_state to d3d_sampler_state. 
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-10-13 22:25:10 +09:00
Józef Kucia 1d8aa72650 d3d11: Rename d3d10_wined3d_device_parent_ops to d3d_wined3d_device_parent_ops. 
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-10-13 22:25:07 +09:00
Józef Kucia 113a94a45d d3d11: Rename d3d10_dxgi_device_parent_vtbl to d3d_dxgi_device_parent_vtbl. 
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-10-13 22:25:04 +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
Józef Kucia cf18ba1dc4 d3d11/tests: Add test for ID3D11Device::GetImmediateContext(). 
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-10-09 20:56:00 +09:00
Józef Kucia 1d10c79af0 d3d11: Add ID3D11DeviceContext stub interface. 
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-10-09 20:55:57 +09:00
Józef Kucia a865b14aed d3d11: Rename d3d10_null_wined3d_parent_ops to d3d_null_wined3d_parent_ops. 
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-10-09 20:55:54 +09:00
Józef Kucia 08fa2f0f73 d3d11: Break lines exceeding 120 characters. 
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-10-09 20:55:50 +09:00
Józef Kucia bd8a7f9e5d d3d11/tests: Port test_create_blend_state() from d3d10core. 
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-10-08 21:01:12 +09:00
Józef Kucia e2f8517833 d3d11: Implement d3d11_device_CreateBlendState(). 
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-10-08 21:01:06 +09:00
Józef Kucia abf6b7422d d3d11: Implement ID3D11BlendState interface. 
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-10-08 21:01:03 +09:00
Józef Kucia c2a171850f d3d11: Rename d3d10_blend_state to d3d_blend_state. 
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-10-08 21:01:00 +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 eac95d30b6 wined3d: Introduce new wined3d_texture_(un)map functions. 
Initial usage in d3d11.
Also removed wined3d_volume_from_resource.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
 2015-10-07 21:28:52 +09:00
Józef Kucia 43bbdac1f0 d3d11/tests: Check that shaders implement d3d10 interfaces. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-06 19:26:29 +09:00
Józef Kucia 9ea0083477 d3d11/tests: Add test for geometry shader to test_create_shader(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-06 19:26:26 +09:00
Józef Kucia d8a6972bd2 d3d11/tests: Check that private data is shared between d3d10 and d3d11 interfaces. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-06 19:24:12 +09:00
Józef Kucia dae7e7487a d3d11/tests: Port test_private_data() from d3d10core. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-06 19:24:09 +09:00
Józef Kucia 894ef070bc d3d11/tests: Port test_device_removed_reason() from d3d10core. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-06 19:24:05 +09:00
Józef Kucia 30fe161469 d3d11: Implement private data methods for ID3D11Device. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-06 19:23:57 +09:00
Marcus Meissner 59a0e3d1f5 d3d11: Remove useless NULL check (Coverity). 
Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
 2015-10-05 19:24:41 +09:00
Józef Kucia 36249205fd d3d11/tests: Port test_create_depthstencil_state() from d3d10core. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:24:21 +09:00
Józef Kucia a77015c795 d3d11: Implement d3d11_device_CreateDepthStencilState(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:24:18 +09:00
Józef Kucia 16e570f4a1 d3d11: Implement ID3D11DepthStencilState interface. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:24:11 +09:00
Józef Kucia ce0c094218 d3d11: Rename d3d10_depthstencil_state to d3d_depthstencil_state. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:24:08 +09:00
Józef Kucia e348fefa2e d3d11: Implement {d3d10, d3d11}_geometry_shader_GetDevice(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:23:58 +09:00
Józef Kucia 9c9b594912 d3d11: Rename d3d10_shader_info to d3d_shader_info. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:23:50 +09:00
Józef Kucia 7da86b434a d3d11: Implement d3d11_device_CreateGeometryShader(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:23:43 +09:00
Józef Kucia d8f8194b15 d3d11: Implement ID3D11GeometryShader interface. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:23:37 +09:00
Józef Kucia 6c8c61f411 d3d11: Rename d3d10_geometry_shader to d3d_geometry_shader. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-05 19:23:27 +09:00
Józef Kucia 9754cda53b d3d11: Rename d3d10_device_inner to d3d_device_inner. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:29 +09:00
Józef Kucia 5fb0281399 d3d11: Rename d3d10_device_init() to d3d_device_init(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:27 +09:00
Józef Kucia 934e4d1852 d3d11/tests: Port test_create_rasterizer_state() from d3d10core. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:26 +09:00
Józef Kucia b8bcac5100 d3d11: Implement d3d11_device_CreateRasterizerState(). 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:23 +09:00
Józef Kucia e006be15b9 d3d11: Implement ID3D11RasterizerState interface. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:16 +09:00
Józef Kucia 3068f0470d d3d11: Rename d3d10_rb_{alloc, realloc, free} to d3d_rb_{alloc, realloc, free}. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:14 +09:00
Józef Kucia 84efabb6c3 d3d11: Rename d3d10_rasterizer_state to d3d_rasterizer_state. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:01:12 +09:00
Józef Kucia dc54d70207 d3d11/tests: Port test_create_shader() from d3d10core. 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
 2015-10-01 00:00:59 +09:00
Józef Kucia 8d253f8401 d3d11: Implement d3d11_device_CreatePixelShader(). 2015-09-16 22:10:43 +09:00
Józef Kucia 13a80eaab1 d3d11: Implement ID3D11PixelShader interface. 2015-09-16 22:10:41 +09:00
Józef Kucia f210c42de7 d3d11: Rename d3d10_pixel_shader to d3d_pixel_shader. 2015-09-16 22:10:39 +09:00
Józef Kucia 70fdfdb11b d3d11: Implement d3d11_device_CreateVertexShader(). 2015-09-16 22:10:38 +09:00
Józef Kucia 32892beba9 d3d11: Implement ID3D11VertexShader interface. 2015-09-16 22:10:36 +09:00
Józef Kucia 92a71ae09c d3d11: Rename d3d10_vertex_shader to d3d_vertex_shader. 2015-09-16 22:10:33 +09:00
Józef Kucia cad6ad9208 d3d11/tests: Add tests for D3D11CreateDeviceAndSwapChain(). 2015-09-16 22:10:30 +09:00
Józef Kucia e441e7b4a9 d3d11: Implement D3D11CreateDeviceAndSwapChain(). 2015-09-16 22:10:20 +09:00
Józef Kucia 1cb181668e d3d11: Implement d3d11_device_CreateInputLayout(). 2015-09-15 20:04:30 +09:00
Józef Kucia 8361963f7b d3d11: Add ID3D11InputLayout interface stub. 2015-09-15 20:04:26 +09:00
Józef Kucia 2a17794ffa d3d11: Rename d3d10_input_layout to d3d_input_layout. 2015-09-15 20:04:16 +09:00
Józef Kucia 77844e2a0e d3d11: Set output parameters to NULL when D3D11CreateDevice() fails. 2015-09-15 20:03:49 +09:00
Józef Kucia ccb30415b6 d3d11: Set immediate_context to NULL in d3d11_device_GetImmediateContext(). 2015-09-15 20:03:46 +09:00
Józef Kucia e0bd44583c d3d11/tests: Port test_create_depthstencil_view() from d3d10core. 2015-09-14 22:30:51 +09:00
Józef Kucia eb45704ba8 d3d11/tests: Port test_create_shader_resource_view() from d3d10core. 2015-09-10 20:01:31 +09:00
Józef Kucia 8972105ee5 d3d11: Implement d3d11_device_CreateShaderResourceView(). 2015-09-10 20:01:29 +09:00
Józef Kucia 487cf3d5c4 d3d11: Implement d3d11_shader_resource_view_GetResource(). 2015-09-10 20:01:27 +09:00
Józef Kucia 28f98a0d9d d3d11: Implement d3d11_shader_resource_view_GetDesc(). 2015-09-10 20:01:26 +09:00
Józef Kucia cdc8d9af86 d3d11: Implement d3d11_shader_resource_view_GetDevice(). 2015-09-10 20:01:21 +09:00
Józef Kucia 3882f2d303 d3d11: Add ID3D11ShaderResourceView interface stub. 2015-09-10 20:01:18 +09:00
Józef Kucia 55d30331a5 d3d11: Rename d3d10_shader_resource_view to d3d_shader_resource_view. 2015-09-10 20:01:16 +09:00
Józef Kucia 5b4d759e55 d3d11/tests: Port test_create_rendertarget_view() from d3d10core. 2015-09-09 19:09:10 +09:00
Józef Kucia 2b211cab69 d3d11: Implement d3d11_rendertarget_view_GetDevice(). 2015-09-09 19:09:06 +09:00
Józef Kucia 9a0d564683 d3d11: Implement d3d11_device_CreateRenderTargetView(). 2015-09-09 19:09:03 +09:00
Józef Kucia 818051c50f d3d11: Implement d3d11_rendertarget_view_GetDesc(). 2015-09-09 19:08:59 +09:00
Józef Kucia 99bb367d52 d3d11: Implement d3d11_rendertarget_view_GetResource(). 2015-09-09 19:08:55 +09:00
Józef Kucia b5b5b381f4 d3d11: Add ID3D11RenderTargetView interface stub. 2015-09-09 19:08:52 +09:00
Józef Kucia 44fa6faa9b d3d11: Rename d3d10_rendertarget_view to d3d_rendertarget_view. 2015-09-09 19:08:47 +09:00
Józef Kucia f5e7018dbf d3d11/tests: Add test for depth stencil view interfaces. 2015-09-08 21:59:17 +09:00
Józef Kucia c003e94371 d3d11: Implement d3d11_device_CreateDepthStencilView(). 2015-09-08 21:59:17 +09:00
Józef Kucia f7c923b1cb d3d11: Implement d3d11_depthstencil_view_GetDesc(). 2015-09-08 21:59:17 +09:00
Józef Kucia 07ce357505 d3d11: Implement d3d11_depthstencil_view_GetResource(). 
The intent is to eventually eliminate wined3d_resource_from_d3d10_resource().
 2015-09-08 21:59:17 +09:00
Józef Kucia 916b1564d3 d3d11: Rename wined3d_resource_from_resource() to wined3d_resource_from_d3d10_resource(). 2015-09-08 21:59:17 +09:00
Józef Kucia 41740bec89 d3d11: Implement d3d11_depthstencil_view_GetDevice(). 2015-09-08 21:59:17 +09:00
Józef Kucia ca4017d2d1 d3d11: Add ID3D11DepthStencilView interface stub. 2015-09-08 21:59:16 +09:00
Józef Kucia 185f9bb351 d3d11: Rename d3d10_depthstencil_view to d3d_depthstencil_view. 2015-09-08 21:59:16 +09:00
Józef Kucia b9747d77f1 d3d11/tests: Add test for buffer interfaces. 2015-09-07 20:07:57 +09:00
Józef Kucia ae2b1539a9 d3d11: AddRef device returned from d3d11_buffer_GetDevice(). 2015-09-07 20:07:55 +09:00
Józef Kucia b500ae04b4 d3d11: Implement d3d11_device_CreateBuffer(). 2015-09-07 20:07:50 +09:00
Józef Kucia 4444917f1a d3d11: Implement d3d10_buffer_GetDesc(). 2015-09-07 20:07:48 +09:00
Józef Kucia 378bec23ef d3d11: Implement d3d11_buffer_GetDesc(). 2015-09-07 20:07:45 +09:00
Stefan Dösinger b486a23bac d3d11: Set surface and volume parents to NULL. 2015-09-04 20:01:08 +09:00
Stefan Dösinger fa0041954f wined3d: Return a texture from the swapchain resource creation callback. 2015-09-04 20:01:05 +09:00
Józef Kucia ba9d80bacd d3d11: Implement d3d11_buffer_GetDevice(). 2015-09-03 21:11:07 +09:00
Józef Kucia c05e8d1460 d3d11: Implement private data methods for ID3D11Buffer. 2015-09-03 21:11:07 +09:00
Józef Kucia 9abc17dcce d3d11: Add ID3D11Buffer interface stub. 2015-09-03 21:11:07 +09:00
Józef Kucia 9c907997f0 d3d11: Rename d3d10_buffer to d3d_buffer. 2015-09-03 21:11:07 +09:00
Józef Kucia 3f5d0fab9c d3d11: Implement private data methods for ID3D11Texture3D. 2015-09-03 21:11:07 +09:00
Józef Kucia 1bc7413946 d3d11: Rename d3d10_{get, set}_private_data functions to d3d_{get, set}_private_data. 2015-09-03 21:11:07 +09:00
Józef Kucia 8821a1462b d3d11/tests: Add test for 3D texture interfaces. 2015-09-03 21:11:06 +09:00
Józef Kucia 0fcfb8a082 d3d11/tests: Port test_create_texture3d() from d3d10core. 2015-09-01 20:59:34 +09:00
Józef Kucia 9a2b73d315 d3d11: Implement d3d11_device_CreateTexture3D(). 2015-09-01 20:59:33 +09:00
Józef Kucia 11cd2dd897 d3d11: Implement d3d11_texture3d_GetDesc(). 2015-09-01 20:59:31 +09:00
Józef Kucia fc844029ee d3d11: Implement d3d11_texture3d_GetDevice(). 2015-09-01 20:59:27 +09:00
Józef Kucia 4665ae6260 d3d11: Add ID3D11Texture3D interface stub. 2015-09-01 20:59:22 +09:00
Józef Kucia 0707fa1912 d3d11: Rename d3d10_texture3d to d3d_texture3d. 2015-09-01 20:59:20 +09:00
Józef Kucia a346d1b705 d3d11: Rename d3d10_texture2d to d3d_texture2d. 2015-08-31 20:13:27 +09:00
Józef Kucia f83181fce0 d3d11/tests: Add test for 2D texture interfaces. 2015-08-31 20:13:27 +09:00
Józef Kucia 44d493aac3 d3d11/tests: Port test_create_texture2d() from d3d10core. 2015-08-31 20:13:27 +09:00
Józef Kucia e0e72d284a d3d11: Implement d3d11_device_CreateTexture2D(). 2015-08-31 20:13:26 +09:00
Józef Kucia a24ff27386 d3d11: Fix resource misc flags conversion. 
Tests with ID3D11Buffers have shown that not all resource misc flags
are translated to d3d10 flags.
 2015-08-31 20:13:26 +09:00
Józef Kucia 59745133f3 d3d11: Fix compilation on GCC with -O0. 2015-08-31 20:13:26 +09:00
Józef Kucia c9ce47c6a9 d3d11: Move d3d11 device implementation to top of file. 
Just to use d311 device static methods in d3d10 device freely.
 2015-08-28 19:53:02 +09:00
Józef Kucia acec54e707 d3d11: Implement d3d11_texture2d_GetDesc(). 2015-08-28 19:53:00 +09:00
Józef Kucia c917a987dc d3d11: Implement d3d11_texture2d_GetDevice. 2015-08-26 23:53:22 +09:00
Józef Kucia 3c74e22317 d3d11: Implement private data methods in ID3D11Texture2D. 2015-08-26 23:53:22 +09:00
Józef Kucia 06ca9e226d d3d11: Add ID3D11Texture2D stub interface. 2015-08-26 23:53:21 +09:00
Henri Verbeet 2edc9584ba d3d11: Use the IUnknown implementation from the d3d11 interface. 
Mostly just for consistency with other D3D code.
 2015-08-25 21:13:36 +09:00
Henri Verbeet b87eb8d947 d3d11: Make "layers" static in D3D11CoreRegisterLayers(). 2015-08-25 21:13:33 +09:00
Henri Verbeet 1a23e2fa0b d3d11: Get rid of a redundant include. 
d3d11_1.h includes d3d11.h, which includes d3d10_1.h.
 2015-08-25 21:13:30 +09:00
Józef Kucia 6038e2ab79 d3d11/tests: Add test for D3D11CreateDevice. 2015-08-24 20:46:22 +09:00
Józef Kucia 4cf1bb929f d3d11: Allow to pass NULL as device to D3D11CreateDevice. 2015-08-24 20:46:18 +09:00