Commit Graph

51 Commits

Author SHA1 Message Date
Henri Verbeet 03c1422a71 wined3d: Get rid of WINED3DUSAGE_TEXTURE.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-06 11:14:36 +01:00
Henri Verbeet 7cba915710 wined3d: Pass correct bind flags to texture creation functions.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-10-31 16:17:36 +01: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
Sven Hesse 66aaaed339 d3d11: Implement d3d10_texture1d_Map().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 09:39:18 +02:00
Sven Hesse bc808acfb5 d3d11: Implement d3d10_texture1d_Unmap().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 09:39:15 +02:00
Sven Hesse 372ca9333c d3d11: Implement d3d10_texture1d_GetDesc().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 09:39:12 +02:00
Sven Hesse d7d0deab06 d3d11: Create DXGI surfaces for 1D textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 09:39:06 +02:00
Sven Hesse fce60001c0 d3d11: Create wined3d textures for 1D textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 09:38:58 +02:00
Sven Hesse f3840daf25 d3d11: Implement d3d11_device_CreateTexture1D().
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-03 09:38:30 +02:00
Henri Verbeet b6f917b102 d3d11: Set resource access based on usage and CPU access flags.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-16 14:24:55 +01:00
Henri Verbeet 469dd87899 d3d11: Set WINED3D_RESOURCE_ACCESS_MAP on 2D textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-13 20:23:26 +01:00
Józef Kucia 2fd86a17bb wined3d: Create multisample 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>
2018-02-09 18:53:06 +01: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
Henri Verbeet 9275b06cc0 wined3d: Replace the pool in struct wined3d_resource_desc with resource access flags.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-02-02 18:36:45 +01:00
Józef Kucia a2fe3ff066 d3d11: Validate resource access flags for buffers and 2D 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>
2018-02-01 22:24:59 +01:00
Józef Kucia bb5c90d967 d3d11: Prefer D3D11 interfaces.
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-01-22 22:26:46 +01:00
Józef Kucia 4a6d3c7eac d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource().
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-01-10 23:16:05 +01:00
Matteo Bruni df461ce90b d3d11: Pass the WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag to wined3d.
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-05 20:30:05 +01:00
Matteo Bruni 72a60e4455 d3d11: Validate MiscFlags for 3D textures.
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-05 20:30:05 +01:00
Matteo Bruni 3561645aa3 d3d11: Validate D3D11_RESOURCE_MISC_GENERATE_MIPS flag for 2D textures.
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 478cc5b2a3 d3d11: Avoid potential double free in d3d_texture2d_create().
The parent is owned by the wined3d_texture object and it is destroyed in
the wined3d_object_destroyed() callback.

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:27 +02:00
Józef Kucia 7ee0118471 d3d11: Validate array size 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:06 +01:00
Józef Kucia 8e4b3c0b02 d3d11: Use WINED3D_POOL_MANAGED for staging 3D textures.
This makes 3D staging textures CPU accessible.

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-03 19:05:13 +01:00
Nikolay Sivov 74a923c31e d3d11: Enabled GetDC() capability for 2D textures.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-08 19:51:32 +09:00
Nikolay Sivov 16a2095556 dxgi: Use texture pointer instead of resource pointer for DXGI surface.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-01 21:21:35 +09:00
Józef Kucia 64014ae3ed wined3d: Add "layer_count" parameter to wined3d_texture_create().
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-04-26 21:35:31 +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
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 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 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 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
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 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 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 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 e0e72d284a d3d11: Implement d3d11_device_CreateTexture2D(). 2015-08-31 20:13:26 +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
Józef Kucia e29a0cf417 d3d11: Rename d3d10_device to d3d_device. 2015-08-21 21:50:16 +09:00