Commit Graph

227 Commits

Author SHA1 Message Date
Riccardo Bortolato fca636a01c d3d9: Don't use a wined3d_volume in d3d9_volume_GetDesc.
finally removed the wind3d_volume pointer from d3d9_volume.
Also removed wined3d_volume_get_resource.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-08 20:59:58 +09:00
Riccardo Bortolato b9cc2859fe d3d9: Make use of wined3d_texture_map in d3d9_volume_LockBox.
Also removed wined3d_volume_map from wined3d public api.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-08 20:59:32 +09:00
Riccardo Bortolato 9621737c8e wined3d: Pass wined3d_texture and sub_resource idx to device_volume_created callback.
Store wined3d_texture and sub_resource in d3d8_volume.
Updated the d3d8_volume_LockBox to make use of wined3d_texture_map.
Also updated d3d9, d3d11, ddraw callbacks accordingly.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
2015-10-07 21:28:52 +09:00
Henri Verbeet b005ad6f90 wined3d: Use rendertarget views for color output instead of surfaces. 2014-08-21 12:24:42 +02:00
Henri Verbeet d1d48d3194 d3d9: The "forwardReference" field in struct d3d9_surface is always a texture, if set. 2014-08-18 12:47:01 +02:00
Henri Verbeet c5e8115ee2 d3d9: Volumes are always part of a texture. 2014-08-15 17:04:10 +02:00
Henri Verbeet 09fda3b805 d3d9: Improve d3d9_device_TestCooperativeLevel(). 2014-06-27 10:37:36 +02:00
Stefan Dösinger f2b5bf26b7 d3d9: Use the private store api for buffers. 2014-03-24 20:20:16 +01:00
Stefan Dösinger 96a74e0cf7 d3d9: Introduce a resource structure. 2014-03-24 20:20:15 +01:00
Henri Verbeet 15c1a26b55 wined3d: Create volumes inside wined3d. 2013-12-06 13:14:52 +01:00
Henri Verbeet afc3d2ab70 wined3d: Create surfaces inside wined3d. 2013-11-15 12:00:26 +01:00
Michael Müller edad7dea7e d3d9: Partial implementation of IDirect3DSwapChain9Ex. 2013-09-20 17:03:20 +02:00
Stefan Dösinger ac871305f8 wined3d: Store the mipmap level in the volume. 2013-08-22 20:15:18 +02:00
Henri Verbeet d6bc4fe71a wined3d: Allow surface flags to be passed to texture creation functions. 2013-06-06 11:47:19 +02:00
Stefan Dösinger f3f172ce81 d3d9: Use dynamic buffers for DrawIndexedPrimitiveUP. 2012-12-19 12:53:23 +01:00
Stefan Dösinger 873603f941 d3d9: Use a dynamic buffer for DrawPrimitiveUP. 2012-12-19 12:53:20 +01:00
Henri Verbeet ddbe791d37 wined3d: Set texture_level in surface_set_texture_target() as well. 2012-10-24 11:24:22 +02:00
Henri Verbeet c98725ccc3 d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc. 2012-07-03 14:56:34 +02:00
Henri Verbeet 2457d34314 d3d9: Pass a wined3d_swapchain_desc structure to swapchain_init(). 2012-07-02 19:18:00 +02:00
Henri Verbeet 56fffd0659 d3d9: Get rid of IDirect3DQuery9Impl. 2012-06-12 17:27:34 +02:00
Henri Verbeet 2f2995de75 d3d9: Get rid of IDirect3DPixelShader9Impl. 2012-06-12 17:27:29 +02:00
Henri Verbeet df9c6aa3ec d3d9: Get rid of IDirect3DVertexShader9Impl. 2012-06-12 17:27:25 +02:00
Henri Verbeet bdd42942c0 d3d9: Get rid of IDirect3DVertexDeclaration9Impl. 2012-06-01 17:46:45 +02:00
Henri Verbeet 79d62ca1fb d3d9: Get rid of IDirect3DStateBlock9Impl. 2012-06-01 17:46:44 +02:00
Henri Verbeet 6341389fe4 d3d9: Get rid of IDirect3DIndexBuffer9Impl. 2012-05-31 18:05:32 +02:00
Henri Verbeet 503b16392b d3d9: Get rid of IDirect3DVertexBuffer9Impl. 2012-05-31 18:05:29 +02:00
Henri Verbeet cb9cc2ccee d3d9: Get rid of IDirect3DSurface9Impl. 2012-05-30 17:18:00 +02:00
Henri Verbeet d4c5c03cbb d3d9: Get rid of IDirect3DSwapChain9Impl. 2012-05-30 17:18:00 +02:00
Henri Verbeet a91ef5217d d3d9: Get rid of IDirect3DVolume9Impl. 2012-05-29 10:45:13 +02:00
Henri Verbeet 2a63fe6624 d3d9: Get rid of IDirect3DDevice9Impl. 2012-05-29 10:45:09 +02:00
Henri Verbeet 82adae949b d3d9: Get rid of IDirect3D9Impl. 2012-05-25 16:24:11 +02:00
Henri Verbeet 5b2d171043 d3d9: Add a separate function for d3d9 initialization. 2012-05-25 16:24:07 +02:00
Henri Verbeet d01e0647d1 d3d9: Get rid of IDirect3DBaseTexture9Impl. 2012-04-25 12:14:54 +02:00
Henri Verbeet 7da2dc747c d3d9: Get rid of IDirect3DVolumeTexture9Impl. 2012-04-24 11:29:40 +02:00
Henri Verbeet 21c65893c9 d3d9: Get rid of IDirect3DCubeTexture9Impl. 2012-04-23 11:47:58 +02:00
Henri Verbeet 5569db9a98 d3d9: Get rid of IDirect3DTexture9Impl. 2012-04-23 11:44:48 +02:00
Henri Verbeet 949f7b4524 d3d9: COM cleanup for the IDirect3DVertexDeclaration9 interface. 2012-04-13 10:48:46 +02:00
Henri Verbeet 5fc17b84d0 d3d9: Store wined3d vertex declarations in the fvf lookup table.
This also implicitly gets rid of the convFVF hack in
IDirect3DVertexDeclaration9Impl_Release().
2012-04-12 20:36:45 +02:00
Henri Verbeet ba67df7a60 d3d9: Introduce a separate function for vertex declaration creation. 2012-04-12 20:36:40 +02:00
Henri Verbeet 53b3f9d40e d3d9: COM cleanup for the IDirect3DSwapChain9 interface.
This is mostly based on the COM cleanup scripts by Michael Stefaniuc.
2012-04-11 18:14:36 +02:00
Henri Verbeet 8b95d8d2e3 d3d9: Introduce a separate function for swapchain creation. 2012-04-11 18:14:30 +02:00
Henri Verbeet cbc3e9985c d3d9: Store an implementation pointer to the d3d9 structure in IDirect3DDevice9Impl. 2012-03-28 11:36:32 +02:00
Stefan Dösinger 038e308a41 wined3d: Relax depth blit requirements. 2012-01-23 16:06:55 +01:00
Henri Verbeet e53a277305 wined3d: Get rid of the WINED3DPOOL typedef. 2012-01-18 12:37:38 +01:00
Henri Verbeet 38c3cde6fd wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef. 2011-12-09 21:15:25 +01:00
Henri Verbeet af6b98c44b wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef. 2011-12-09 21:15:24 +01:00
Michael Stefaniuc 4e31d28cff d3d9: COM cleanup for the IDirect3DSurface9 iface. 2011-07-07 12:32:19 +02:00
Michael Stefaniuc a7530e7892 d3d9: Use unsafe_impl_from_IDirect3DSurface9 for app provided ifaces. 2011-07-07 12:32:16 +02:00
Michael Stefaniuc 17eccaffbf d3d9: COM cleanup for the IDirect3DVertexBuffer9 iface. 2011-07-06 16:49:10 +02:00
Michael Stefaniuc 2b3a364e9a d3d9: Use unsafe_impl_from_IDirect3DVertexBuffer9 for app provided ifaces. 2011-07-06 16:49:04 +02:00
Michael Stefaniuc bb4f750592 d3d9: COM cleanup for the IDirect3DVertexShader9 iface. 2011-07-06 16:49:00 +02:00
Michael Stefaniuc f12cbfb509 d3d9: Use unsafe_impl_from_IDirect3DVertexShader9 for an app provided iface. 2011-07-06 16:48:56 +02:00
Michael Stefaniuc b09078b016 d3d9: COM cleanup for the IDirect3DPixelShader9 iface. 2011-07-05 14:30:42 +02:00
Michael Stefaniuc 704f0efe0c d3d9: Use unsafe_impl_from_IDirect3DPixelShader9 for an app provided iface. 2011-07-05 14:30:38 +02:00
Michael Stefaniuc db1dd90225 d3d9: COM cleanup for the IDirect3DIndexBuffer9 iface. 2011-07-05 14:30:33 +02:00
Michael Stefaniuc 875d6900c6 d3d9: Use unsafe_impl_from_IDirect3DIndexBuffer9 for an app provided iface. 2011-07-05 14:30:31 +02:00
Andrew Nguyen 94785ab4d5 d3d9: Increment the reference count of the IDirect3D9 parent when creating a device. 2011-06-06 21:49:19 +02:00
Henri Verbeet 3032b40c80 wined3d: Get rid of the IWineD3DDeviceParent interface. 2011-05-19 10:06:21 +02:00
Henri Verbeet 8d4ca1f815 wined3d: Remove COM from the device implementation. 2011-05-17 10:06:18 +02:00
Henri Verbeet 1c1de920e3 wined3d: Remove COM from the surface implementation. 2011-04-29 16:52:13 +02:00
Michael Stefaniuc d5739cd2c3 d3d9: Finish the COM cleanup of the IDirect3DDevice9Ex iface. 2011-04-25 11:40:35 +02:00
Michael Stefaniuc a3e77bfe59 d3d9: COM cleanup for the IDirect3DVolumeTexture9 iface. 2011-04-20 16:34:01 +02:00
Michael Stefaniuc aab2d427e3 d3d9: COM cleanup for the IDirect3DVolume9 iface. 2011-04-20 16:33:55 +02:00
Michael Stefaniuc 31bea55ef4 d3d9: COM cleanup for the IDirect3DTexture9 iface. 2011-04-20 16:33:42 +02:00
Henri Verbeet 2c450571e5 wined3d: Remove COM from the volume implementation. 2011-04-15 10:07:57 +02:00
Henri Verbeet 3ec19590d5 wined3d: Remove COM from the swapchain implementation. 2011-04-14 17:13:57 +02:00
Michael Stefaniuc 29116e2400 d3d9: COM cleanup for the IDirect3DCubeTexture9 iface. 2011-04-12 12:50:44 +02:00
Michael Stefaniuc a991b6708b d3d9: COM cleanup for the IDirect3DStateBlock9 iface. 2011-04-12 12:50:37 +02:00
Michael Stefaniuc 78ea105b85 d3d9: COM cleanup for the IDirect3DQuery9 iface. 2011-04-12 12:50:30 +02:00
Henri Verbeet 3c07f7a68e d3d9: Get rid of the implicit swapchain refcounting hacks. 2011-04-11 23:54:18 +02:00
Michael Stefaniuc a159569115 d3d9: COM cleanup for the IDirect3D9Ex iface. 2011-04-11 12:10:47 +02:00
Henri Verbeet f8f83ff2f7 wined3d: Remove COM from the shader implementation. 2011-03-31 12:37:46 +02:00
Henri Verbeet 3d4fe0b750 wined3d: Get rid of IWineD3DPixelShader. 2011-03-30 12:18:03 +02:00
Henri Verbeet 49725ba583 wined3d: Get rid of IWineD3DVertexShader. 2011-03-30 12:17:51 +02:00
Henri Verbeet fd8e18bd2b wined3d: Remove COM from the texture implementation. 2011-03-28 17:08:52 +02:00
Henri Verbeet b8c40f3a7e wined3d: Get rid of IWineD3DCubeTexture. 2011-03-18 15:59:04 +01:00
Henri Verbeet f1ec3820d7 wined3d: Get rid of IWineD3DTexture. 2011-03-17 10:40:52 +01:00
Henri Verbeet ed0037854a wined3d: Get rid of IWineD3DVolumeTexture. 2011-03-16 14:14:21 +01:00
Henri Verbeet a27ee75ed2 wined3d: Remove COM from the buffer implementation. 2011-03-04 16:25:58 +01:00
Henri Verbeet a5fe3610ad wined3d: Remove COM from the query implementation. 2011-02-04 15:25:32 +01:00
Henri Verbeet 5765632d9f wined3d: Remove COM from the vertex declaration. 2011-02-03 13:15:17 +01:00
Henri Verbeet 36d4268e3c wined3d: Remove COM from IWineD3D. 2011-02-02 12:22:42 +01:00
Henri Verbeet 4b109ff1f8 wined3d: Remove COM from the stateblock. 2011-01-31 12:24:58 +01:00
Henri Verbeet cd957f5b64 d3d9: Partially implement IDirect3D9Ex::CreateDeviceEx(). 2010-10-27 12:12:00 +02:00
Henri Verbeet 2465b4cf01 d3d9: Move device functions to device.c. 2010-09-01 14:01:02 +02:00
Henri Verbeet cc5271d1b7 wined3d: Rename WINED3DFORMAT to wined3d_format_id. 2010-08-24 12:25:01 +02:00
Henri Verbeet 7f8ccf0342 d3d9: Add a separate function for stateblock initialization. 2010-01-20 15:32:15 +01:00
Henri Verbeet bfb63a8634 d3d9: Add a separate function for query initialization. 2010-01-18 14:37:21 +01:00
Henri Verbeet 76804fa711 d3d9: Add a separate function for swapchain initialization. 2009-12-21 15:01:25 +01:00
Henri Verbeet 434a23d90d d3d9: Move D3D9CB_DestroySwapChain() to device.c. 2009-11-18 11:16:35 +01:00
Henri Verbeet b9243b721a d3d9: Add a separate function for device initialization. 2009-11-18 11:16:31 +01:00
Henri Verbeet 7f1c802b9f d3d9: Add a separate function for pixel shader initialization. 2009-09-24 13:24:40 +02:00
Henri Verbeet cdb741274a d3d9: Add a separate function for vertex shader initialization. 2009-09-24 13:24:04 +02:00
Henri Verbeet 0241fefa94 d3d9: Add a separate function for vertex declaration initialization. 2009-09-23 12:35:00 +02:00
Henri Verbeet 359acf2461 d3d9: Limit "NumSimultaneousRTs" to 4. 2009-09-22 16:17:30 +02:00
Henri Verbeet de9b47924d d3d9: Add a separate function for vertex buffer initialization. 2009-09-18 08:55:05 -05:00
Henri Verbeet 5ec05c556d d3d9: Add a separate function for index buffer initialization. 2009-09-18 08:55:00 -05:00
Henri Verbeet 75f005ebf9 d3d9: Add a separate function for texture initialization. 2009-09-17 10:10:10 -05:00
Henri Verbeet c51fbe9293 d3d9: Add a separate function for cube texture initialization. 2009-09-17 10:09:28 -05:00
Henri Verbeet 5b7b4f59d2 d3d9: Add a separate function for volume texture initialization. 2009-09-16 13:05:51 -05:00