Commit Graph

63 Commits

Author SHA1 Message Date
Paul Gofman 600f39d4ad d3d11: Mind DSV flags when checking for conflicting SRV.
Fixes a regression introduced by commit 3f698b950f.

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-31 17:39:13 +01:00
Alexandre Julliard d216374962 d3d11: Build with msvcrt.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-02 10:00:29 +02:00
Józef Kucia e3d485359d d3d11: Introduce get_resource_properties() helper function.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-06-20 16:02:29 +02:00
Józef Kucia f9a66eb40d d3d11: Normalize 1D texture view descriptions.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-06-15 09:11:26 +02:00
Józef Kucia bf293b70c9 d3d11: Add ID3D11Device2 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>
2018-05-16 18:47:30 +02:00
Nikolay Sivov f01d1034d9 d3d11: Add ID3D11Device1 stub.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-30 20:41:59 +02:00
Henri Verbeet 600d6b0199 d3d11: Use the global memory allocation helpers.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-05 10:00:07 +01:00
Matteo Bruni ee00b90fa4 d3d11: Disallow 0-sized buffer shader resource views.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-12-01 15:56:55 +01:00
Józef Kucia 5b30550311 d3d11: Delay destroying unordered access view until it is no longer referenced.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-27 19:00:26 +02:00
Józef Kucia 668650335d d3d11: Delay destroying shader resource view until it is no longer referenced.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-27 19:00:26 +02:00
Józef Kucia 2437e3559c d3d11: Delay destroying render target view until it is no longer referenced.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-27 19:00:26 +02:00
Józef Kucia 02a767cde2 d3d11: Delay destroying depth stencil view until it is no longer referenced.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-04-27 19:00:26 +02:00
Józef Kucia 5ac8be243d d3d11: Fix default shader resource views for cube textures.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-02-10 21:29:04 +01:00
Józef Kucia 57fac9b02e d3d11: Do not keep reference to 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>
2017-02-02 19:50:36 +01:00
Józef Kucia 5ee3f54438 wined3d: Use single structure for view description.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-12-06 15:02:34 +01:00
Józef Kucia 35a6ca530e d3d11: Implement UAV binding.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-11-24 14:30:58 +01:00
Józef Kucia 9c0212267f d3d11: Sanitize buffer view flags.
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-09-19 23:13:51 +09:00
Michael Müller 983b3577ca d3d11: Fix calculation of array size for 1D textures.
Signed-off-by: Michael Müller <michael@fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-24 22:24:13 +09:00
Józef Kucia 3056608fb8 d3d11: Allow creating SRVs for structured buffers with NULL description.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-21 23:36:03 +09:00
Józef Kucia b68dfc5c8a d3d11: Allow creating UAVs for structured buffers with NULL description.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-21 23:36:03 +09:00
Józef Kucia abc62dfabb d3d11: Avoid signed/unsigned comparison.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-04 23:06:51 +09:00
Józef Kucia 80334776b3 d3d11: Implement ID3D11UnorderedAccessView 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>
2016-07-04 23:06:44 +09:00
Józef Kucia 599aa89fb0 d3d11: Rename set_{ds, rt, sr}desc_from_resource() functions.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-17 22:52:54 +09:00
Józef Kucia 215d9299a4 d3d11: Validate "ViewDimension" field in D3D11_RENDER_TARGET_VIEW_DESC.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-17 00:09:22 +09:00
Józef Kucia 0626559c53 d3d11: Validate "ViewDimension" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-17 00:09:22 +09:00
Józef Kucia 8f366a5673 d3d11: Validate "ViewDimension" field in D3D11_SHADER_RESOURCE_VIEW_DESC.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-17 00:09:21 +09:00
Józef Kucia 026d5839ba d3d11: Normalize SRV descriptions for remaining view dimensions.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-09 21:56:55 +09:00
Józef Kucia 6b1bd3ded0 d3d11: Normalize "ArraySize" field in D3D11_DEPTH_STENCIL_VIEW_DESC.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-09 21:56:51 +09:00
Józef Kucia 723f73aeb6 d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-09 21:56:43 +09:00
Józef Kucia 424532c5bd wined3d: Remove "view_type" from "wined3d_shader_resource_view_desc".
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-07 22:06:11 +09:00
Józef Kucia 696cd4bdf1 d3d11: Normalize more fields in SRV descriptions.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-06 22:18:53 +09:00
Józef Kucia 9bbf3ca0fa wined3d: Add wined3d_shader_resource_view_desc.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-06 22:18:50 +09:00
Józef Kucia 4a86e3d497 d3d11: Accept DXGI_FORMAT_UNKNOWN as format in view descriptions.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-05-18 19:39:03 +09:00
Józef Kucia 445ed18b72 d3d11: Fix default view descriptions for 2D array 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-05-17 21:01:46 +09:00
Matteo Bruni b0a9e0cebd d3d11: Add a couple missing wined3d_mutex_unlock() in d3d_shader_resource_view_init() error paths.
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-25 23:35:12 +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 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
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 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 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 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 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 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