Commit Graph

373 Commits

Author SHA1 Message Date
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
Józef Kucia 9af58dc110 d3d11/tests: Add test for device interfaces. 2015-08-24 20:46:00 +09:00
Józef Kucia e29a0cf417 d3d11: Rename d3d10_device to d3d_device. 2015-08-21 21:50:16 +09:00
Józef Kucia b2f5fad4b6 d3d11: Implement D3D11CreateDevice. 2015-08-21 21:50:07 +09:00
Józef Kucia a9cb14dd71 d3d11: Move d3d10core to d3d11. 2015-08-21 21:49:43 +09:00
Austin English 9e94232711 d3d11: Add a stub for D3D11CreateDeviceAndSwapChain. 2015-07-10 21:43:07 +09:00
Stefan Dösinger 9d93af793d d3d11: Switch to d3d-style formatting. 2015-02-05 19:59:06 +09:00
Stefan Dösinger e25a115b72 d3d11: Print UINT sdk_version with %u. 2015-02-05 19:58:55 +09:00
Alexandre Julliard 5e7416e5c8 makefiles: Get rid of the MAKE_DLL_RULES variable. 2014-01-02 12:08:18 +01:00
Andrey Gusev f5be799b07 d3d11: Add version.rc file. 2013-12-02 11:08:53 +01:00
Jacek Caban 0e5d64cc44 d3d11: Use proper D3D11CreateDevice argument types. 2013-09-11 16:08:54 +02:00
Francois Gouget aaabd02cff d3d11: Make debug_d3d_driver_type() static. 2013-02-15 11:52:55 +01:00
Austin English 0130eca6a0 d3d11: Add a stub for D3D11CreateDevice. 2013-02-13 16:13:54 +01:00
Austin English 1d1cb5236e d3d11: Add a stub dll. 2012-12-12 20:30:25 +01:00