Commit Graph

432 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 8dd86823fd d3d9: Make use of wined3d_texture_unmap in d3d9_volume_UnlockBox.
Also removed wined3d_volume_unmap 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:46 +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
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
Riccardo Bortolato 1d1487105d wined3d: Pass a wined3d_box to wined3d_surface_map..
Introduced a new surface_check_block_align function that accepts a
wined3d_box, eventually the old _rect version will be completely
replaced.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
2015-10-07 21:28:51 +09:00
Riccardo Bortolato 825b141e5a wined3d: Remove wined3d_surface_get_flip_status stub. 2015-09-10 20:00:52 +09:00
Riccardo Bortolato e869ef5c0f wined3d: Remove wined3d_surface_get_blt_status stub. 2015-09-10 20:00:46 +09:00
Riccardo Bortolato 9eb47678de wined3d: Remove volume reference counting from public interface. 2015-09-10 20:00:32 +09:00
Riccardo Bortolato 5cba355a83 wined3d: Remove wined3d_volume_get_parent. 2015-09-10 20:00:23 +09:00
Riccardo Bortolato 02ce14b3ef wined3d: Remove wined3d_volume_preload. 2015-09-10 20:00:15 +09:00
Stefan Dösinger 2936e4ac54 wined3d: Remove wined3d_backbuffer_type. 2015-09-08 21:59:16 +09:00
Stefan Dösinger fa0041954f wined3d: Return a texture from the swapchain resource creation callback. 2015-09-04 20:01:05 +09:00
Stefan Dösinger feb35006f5 wined3d: Remove wined3d_device_get_back_buffer. 2015-09-03 21:11:08 +09:00
Stefan Dösinger f010e5d88a wined3d: Return a texture from wined3d_swapchain_get_back_buffer. 2015-09-03 21:11:07 +09:00
Stefan Dösinger c4e4647ca5 d3d9: Validate swap effect and backbuffer count. 2015-08-27 21:43:46 +09:00
Henri Verbeet 2773b27bb1 wined3d: Use unsigned mask constants in shifts. 2015-08-26 23:53:22 +09:00
Stefan Dösinger 40c5303b62 ddraw: Return the right error if range color keys are used. 2015-08-24 20:42:40 +09:00
Henri Verbeet 62a02a047f d3d10core: Implement d3d10_device_UpdateSubresource(). 2015-08-18 18:28:47 +09:00
Henri Verbeet fca2d19423 dxgi: Implement dxgi_swapchain_ResizeBuffers(). 2015-08-07 23:44:19 +09:00
Henri Verbeet 7f416ff339 wined3d: Validate "data" in buffer_init(). 2015-07-31 12:08:53 +02:00
Henri Verbeet e2c0c611d4 d3d10core: Implement d3d10_device_CopySubresourceRegion(). 2015-07-20 11:50:27 +02:00
Matteo Bruni e35f82665c include: Fix comments about the availability of D3D light types. 2015-05-01 15:44:54 +09:00
Matteo Bruni b963c73abb wined3d: Introduce D3D7+ normal matrix computation. 2015-04-24 19:07:52 +09:00
Henri Verbeet 94967c28b9 wined3d: Add support for half-integer pixel centers.
Like in OpenGL and Direct3D 10+.
2015-03-30 19:10:29 +09:00
Henri Verbeet 010ff106dd d3d10core: Implement d3d10_device_DrawInstanced(). 2015-03-24 17:41:17 +09:00
Henri Verbeet a33d3ad41b wined3d: Add support for SV_InstanceID. 2015-03-24 17:41:12 +09:00
Henri Verbeet f9fafb3686 wined3d: Use the "sysval_semantic" field instead of "semantic_name" to recognize SV_POSITION. 2015-03-24 17:41:09 +09:00
Henri Verbeet 1b08196c5a wined3d: Implement d3d10 style instance data step rates. 2015-03-24 17:41:06 +09:00
Henri Verbeet 88f230b56e d3d10core: Also pass unused input layout elements to wined3d.
While these won't be used by the shader, they potentially affect the
calculated offset for WINED3D_APPEND_ALIGNED_ELEMENT elements.
2015-03-23 22:59:12 +09:00
Henri Verbeet ba396e4212 wined3d: Simplify the wined3d_matrix structure. 2015-03-20 21:32:46 +09:00
Henri Verbeet 849149d5d3 wined3d: Add support for appending vertex declaration elements. 2015-02-13 18:53:17 +09:00
Stefan Dösinger 3ef1d6bcd9 wined3d: Pass WM_SYSCOMMAND(SC_RESTORE) to DefWindowProc. 2015-01-28 11:06:48 +01:00
Henri Verbeet ca06f960ed wined3d: Use the same flags for wined3d_texture_set_color_key() and the "color_key_flags" field it sets.
This fixes a regression introduced by commit a8ab569415.
2015-01-19 14:31:51 +01:00
Henri Verbeet c6232e1d11 wined3d: Create GL sampler objects for wined3d sampler objects. 2015-01-15 17:24:43 +01:00
Henri Verbeet 4b480f5519 wined3d: Introduce struct wined3d_sampler_desc. 2015-01-15 17:24:32 +01:00
Henri Verbeet ea534c9ab4 wined3d: Allow initial texture contents to be specified with wined3d_texture_create(). 2015-01-05 20:15:35 +01:00
Henri Verbeet af9ccb490a ddraw: Use wined3d_log2i() to calculate the level count in ddraw_surface_create(). 2014-12-10 19:32:08 +01:00
Stefan Dösinger 19c860499a wined3d: Filter messages generated by focus handling. 2014-12-08 14:18:43 +01:00
Henri Verbeet 0e8f2786e9 wined3d: Keep a reference to the resource in shader resource views. 2014-12-01 11:00:23 +01:00
Stefan Dösinger f6dde70624 wined3d: Restore the display mode on focus change. 2014-11-19 17:56:44 +09:00
Stefan Dösinger 06328e91f7 wined3d: Add new D3DCREATE flags. 2014-11-13 20:35:46 +09:00
Matteo Bruni ea85db2a3f wined3d: Add ATI1N texture format support. 2014-11-04 21:15:56 +09:00
Henri Verbeet 875a7c5426 wined3d: Use the input signature to setup SM4 pixel shader input semantics. 2014-11-04 16:54:35 +09:00
Henri Verbeet a21784b116 d3d10core: Free the output signature after creating the wined3d shader. 2014-11-04 16:54:32 +09:00
Henri Verbeet 97856bcfee wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc(). 2014-09-29 10:37:35 +02:00
Henri Verbeet a3daed9604 d3d10core: Implement d3d10_device_GetPredication(). 2014-09-19 10:49:24 +02:00
Henri Verbeet fdf60e51fc d3d10core: Implement d3d10_device_SetPredication(). 2014-09-19 10:49:11 +02:00
Henri Verbeet 686546b6d3 d3d10core: Create wined3d queries for queries. 2014-09-19 10:49:02 +02:00
Henri Verbeet f06a57f678 d3d10core: Implement d3d10_device_PSGetShaderResources(). 2014-09-17 11:05:08 +02:00
Henri Verbeet 8080212f43 d3d10core: Implement d3d10_device_PSSetShaderResources(). 2014-09-17 11:05:05 +02:00
Henri Verbeet 354a6d4e2c d3d10core: Implement d3d10_device_GSGetShaderResources(). 2014-09-17 11:05:01 +02:00
Henri Verbeet 9c3266fe1d d3d10core: Implement d3d10_device_GSSetShaderResources(). 2014-09-17 11:04:58 +02:00
Henri Verbeet 482e5f589b d3d10core: Implement d3d10_device_VSGetShaderResources(). 2014-09-17 11:04:54 +02:00
Henri Verbeet 1e434b52d0 d3d10core: Implement d3d10_device_VSSetShaderResources(). 2014-09-16 12:24:59 +02:00
Henri Verbeet e01d207699 d3d10core: Create wined3d views for shader resource views. 2014-09-16 12:24:50 +02:00
Henri Verbeet 736b9e1c1c wined3d: Get rid of wined3d_device_color_fill(). 2014-08-22 12:53:26 +02:00
Henri Verbeet 07985a8c38 wined3d: Use rendertarget views for depth/stencil buffers instead of surfaces.
I don't think the difference between d3d10 depth/stencil and rendertarget
views is large enough to justify a separate type. Unfortunately that does make
the name "wined3d_rendertarget_view" slightly awkward.
2014-08-22 12:53:11 +02:00
Henri Verbeet b005ad6f90 wined3d: Use rendertarget views for color output instead of surfaces. 2014-08-21 12:24:42 +02:00
Henri Verbeet fb7135efd1 wined3d: Introduce struct wined3d_rendertarget_view_desc. 2014-08-21 12:24:28 +02:00
Henri Verbeet 9020ef9675 wined3d: Make the "desc" parameter to wined3d_buffer_create() const. 2014-08-04 14:23:40 +02:00
Henri Verbeet 6a1a18e7e2 d3d10core: Implement d3d10_device_CopyResource(). 2014-08-04 14:23:36 +02:00
Stefan Dösinger 341db6d8d3 wined3d: Remove wined3d_texture_set/get_priority. 2014-07-16 16:10:05 +02:00
Stefan Dösinger cf11933701 wined3d: Remove wined3d_buffer_set/get_priority. 2014-07-16 16:10:01 +02:00
Stefan Dösinger 086545cdd3 wined3d: Remove wined3d_volume_set/get_priority. 2014-07-16 16:09:56 +02:00
Stefan Dösinger 2abecc46c6 wined3d: Remove wined3d_surface_set/get_priority. 2014-07-16 16:09:51 +02:00
Stefan Dösinger 9d49b7a9be wined3d: Set palettes on the swapchain. 2014-06-30 22:04:53 +02:00
Henri Verbeet 09fda3b805 d3d9: Improve d3d9_device_TestCooperativeLevel(). 2014-06-27 10:37:36 +02:00
Stefan Dösinger fd0189bbfa wined3d: Move get_dc palette updates to ddraw. 2014-05-15 19:05:02 +02:00
Stefan Dösinger fc25510fad wined3d: Remove wined3d_surface_get_palette. 2014-05-12 21:24:59 +02:00
Henri Verbeet ac70dd2c97 ddraw: Validate the pitch for user memory surfaces against the unaligned minimum pitch.
User memory surfaces have a different minimum alignment from regular surfaces.
This fixes a regression introduced by commit
9c138d772c.
2014-04-23 15:00:35 +02:00
Matteo Bruni a1784d9ed9 wined3d: Add support for timestamp queries. 2014-04-17 13:53:00 +02:00
Stefan Dösinger ebd5f96aea wined3d: Remove resource private data methods. 2014-03-24 20:20:18 +01:00
Stefan Dösinger 938529e1f9 wined3d: Remove the version parameter. 2014-03-20 19:04:37 +01:00
Stefan Dösinger 51c3203e49 wined3d: Free old data after addrefing the new one. 2014-03-14 18:54:59 +01:00
Stefan Dösinger 6a34d4b40f wined3d: Decouple private data from the resource structure. 2014-03-14 18:54:48 +01:00
Martin Storsjo 171529106b wined3d: Add support for NV12 textures. 2014-02-17 20:16:29 +01:00
Henri Verbeet 175c63773d wined3d: Don't allow format conversion on Present() for d3d8.
Note that this isn't currently enforced by wined3d_swapchain_create() or
wined3d_device_reset() though.
2014-01-29 20:25:52 +01:00
Henri Verbeet 51cdeeacd4 wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen. 2014-01-10 12:06:09 +01:00
Henri Verbeet 4710c4b51a wined3d: Store color keys in textures instead of in surfaces. 2014-01-09 15:50:39 +01:00
Stefan Dösinger b91973daa7 wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc . 2014-01-08 20:02:22 +01:00
Henri Verbeet 4e7b62a46d wined3d: Get rid of unused palette flags. 2013-12-13 12:36:11 +01:00
Henri Verbeet f27bb660b3 wined3d: Explicitly pass the palette size to wined3d_palette_create(). 2013-12-13 12:36:11 +01:00
Henri Verbeet 89dedf6408 ddraw: Just set the palette caps in ddraw7_GetCaps(). 2013-12-13 12:36:11 +01:00
Henri Verbeet bf7f80f4b3 ddraw: Store the palette flags in the ddraw palette. 2013-12-12 12:08:23 +01:00
Henri Verbeet 1f0bb534ec ddraw: Keep a reference to the palette in the surface. 2013-12-12 12:08:16 +01:00
Henri Verbeet 15c1a26b55 wined3d: Create volumes inside wined3d. 2013-12-06 13:14:52 +01:00
Henri Verbeet 7524258aaf ddraw: Implement flips inside ddraw. 2013-12-05 12:40:56 +01:00
Henri Verbeet 4b3db52b53 wined3d: Merge the texture creation functions. 2013-11-27 11:30:15 +01:00
Henri Verbeet afc3d2ab70 wined3d: Create surfaces inside wined3d. 2013-11-15 12:00:26 +01:00
Stefan Dösinger 80638b6d2f wined3d: Enforce texturing capability format restrictions on resource creation. 2013-09-06 17:25:08 +02:00
Henri Verbeet 43ecaf29c3 wined3d: Get rid of the DDRAW_PITCH_ALIGNMENT and D3D8_PITCH_ALIGNMENT constants. 2013-08-29 19:56:17 +02:00
Henri Verbeet b85c2a74bb wined3d: Replace the "stateBlock" wined3d_device field with a wined3d_state structure. 2013-08-27 11:50:53 +02:00
Stefan Dösinger ac871305f8 wined3d: Store the mipmap level in the volume. 2013-08-22 20:15:18 +02:00
Henri Verbeet 4de77fa23f wined3d: Allow a custom pitch to be specified in wined3d_surface_set_mem(). 2013-06-14 11:46:20 +02:00
Henri Verbeet d6bc4fe71a wined3d: Allow surface flags to be passed to texture creation functions. 2013-06-06 11:47:19 +02:00
Henri Verbeet 91096dd7ad wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_3d(). 2013-06-06 11:47:07 +02:00
Henri Verbeet b23739316c wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_cube(). 2013-06-05 17:31:39 +02:00
Henri Verbeet 9d4cbd6195 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_2d(). 2013-06-05 17:31:39 +02:00
Henri Verbeet 13a38e8d5e wined3d: Pass a wined3d_resource_desc structure to device_parent_create_swapchain_surface(). 2013-06-04 10:14:28 +02:00
Henri Verbeet a4d2660c9b wined3d: Pass a wined3d_resource_desc structure to device_parent_create_texture_surface(). 2013-06-04 10:14:26 +02:00
Stefan Dösinger 9287bb80dc d3d: d3d9ex does not do video memory accounting for D3DPOOL_DEFAULT resources. 2013-05-20 19:08:28 +02:00
Henri Verbeet 2e7add90c0 wined3d: Get rid of the unused wined3d_strided_data structure. 2013-04-19 10:43:42 +02:00
Matteo Bruni 5e28b0c974 wined3d: Add RESZ support. 2013-02-19 10:39:47 +01:00
Stefan Dösinger 1a3f741643 wined3d: Remove draw_primitive_strided. 2013-01-25 11:30:33 +01:00
Stefan Dösinger 149a85c2e7 d3d: Remove high level patch support.
No Windows driver ever exposed this, and no game uses this. The
only application that used this feature is a DirectX 8 SDK sample.
2013-01-25 11:29:41 +01:00
Henri Verbeet 1249976eb6 wined3d: Get rid of the surface_type parameter to wined3d_check_device_format(). 2013-01-17 12:22:01 +01:00
Henri Verbeet ce912d5149 wined3d: Get rid of the surface_type parameter to wined3d_surface_create(). 2013-01-17 12:21:55 +01:00
Henri Verbeet 31e8976910 wined3d: Get rid of the surface_type parameter to wined3d_swapchain_create(). 2013-01-16 12:22:57 +01:00
Henri Verbeet 7595a58085 ddraw: Explicitly create a wined3d object without 3D capabilities when creating a normal wined3d object fails. 2013-01-14 11:01:53 +01:00
Stefan Dösinger 8cf55497cc wined3d: Remove draw_*_primitive_up.
Note that I can't remove the state->user_stream mess yet, because of
draw_*_primitive_strided. Another patchset will deal with that.
2012-12-19 12:53:28 +01:00
Henri Verbeet 9fbd3bbed6 d3d10core: Implement d3d10_device_PSGetSamplers(). 2012-12-10 11:25:49 +01:00
Henri Verbeet 4c4131cd78 d3d10core: Implement d3d10_device_PSSetSamplers(). 2012-12-10 11:25:46 +01:00
Henri Verbeet 2c01e11eca d3d10core: Implement d3d10_device_GSGetSamplers(). 2012-12-07 10:35:51 +01:00
Henri Verbeet 047d607e07 d3d10core: Implement d3d10_device_GSSetSamplers(). 2012-12-07 10:35:44 +01:00
Henri Verbeet c98767a425 d3d10core: Implement d3d10_device_VSGetSamplers(). 2012-12-06 12:55:59 +01:00
Henri Verbeet e5805c316c d3d10core: Implement d3d10_device_VSSetSamplers(). 2012-12-06 12:55:50 +01:00
Henri Verbeet 6ac3c48384 d3d10core: Implement d3d10_device_PSGetConstantBuffers(). 2012-12-05 12:44:07 +01:00
Henri Verbeet b034f49183 d3d10core: Implement d3d10_device_PSSetConstantBuffers(). 2012-12-05 12:44:01 +01:00
Henri Verbeet d906c94382 d3d10core: Implement d3d10_device_GSGetConstantBuffers(). 2012-12-04 00:02:06 +01:00
Henri Verbeet feda45279e d3d10core: Implement d3d10_device_GSSetConstantBuffers(). 2012-12-04 00:02:00 +01:00
Henri Verbeet 027ef4ccdb d3d10core: Implement d3d10_device_VSGetConstantBuffers(). 2012-11-30 11:42:54 +01:00
Henri Verbeet ae5e15319e d3d10core: Implement d3d10_device_VSSetConstantBuffers(). 2012-11-30 11:42:48 +01:00
Henri Verbeet 7f62678c16 d3d10core: Implement d3d10_device_DrawIndexedInstanced(). 2012-11-27 16:54:57 +01:00
Henri Verbeet dc67be012f d3d10core: Implement d3d10_device_SOGetTargets(). 2012-11-23 14:40:36 +01:00
Henri Verbeet 5b781d709d d3d10core: Implement d3d10_device_SOSetTargets(). 2012-11-23 14:40:30 +01:00
Henri Verbeet d0d213f7d1 d3d10core: Implement d3d10_device_IAGetIndexBuffer(). 2012-11-21 13:25:57 +01:00
Henri Verbeet 79f0b4d977 d3d9: Avoid resetting device state for d3d9ex resets. 2012-11-20 11:44:27 +01:00
Henri Verbeet 25c449247f d3d10core: Implement d3d10_device_GSGetShader(). 2012-11-14 11:27:44 +01:00
Henri Verbeet 9081f8afb1 d3d10core: Implement d3d10_device_GSSetShader(). 2012-11-14 11:27:40 +01:00
Henri Verbeet 2bf46c60fb wined3d: Replace the face and level parameters to device_parent_create_texture_surface() with the sub-resource index. 2012-10-25 11:48:25 +02: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 9d127a4d36 wined3d: wined3d_surface_set_palette() never fails. 2012-10-09 09:59:38 +02:00
Henri Verbeet 8e24dbb60a wined3d: wined3d_stateblock_apply() never fails. 2012-10-08 11:28:37 +02:00
Henri Verbeet b69545c7da wined3d: wined3d_stateblock_capture() never fails. 2012-10-08 11:28:32 +02:00
Henri Verbeet adddf10cd8 wined3d: wined3d_swapchain_get_desc() never fails. 2012-10-04 14:09:55 +02:00
Henri Verbeet 5fcc1f8f70 wined3d: Just return the surface from wined3d_swapchain_get_back_buffer(). 2012-10-04 14:09:50 +02:00
Henri Verbeet e55416a113 wined3d: wined3d_swapchain_set_window() never fails. 2012-10-03 11:19:41 +02:00
Henri Verbeet 50c61959eb wined3d: Just return the surface from wined3d_device_get_surface_from_dc(). 2012-10-03 11:19:41 +02:00
Henri Verbeet 2ad5808996 wined3d: wined3d_device_get_creation_parameters() never fails. 2012-10-01 23:07:55 +02:00
Henri Verbeet 6e5cf8c698 wined3d: wined3d_device_set_depth_stencil() never fails. 2012-10-01 23:07:51 +02:00
Henri Verbeet 95b4207c7f wined3d: Just return the surface from wined3d_device_get_depth_stencil(). 2012-10-01 12:11:02 +02:00
Henri Verbeet 972217fd6a wined3d: Just return the surface from wined3d_device_get_render_target(). 2012-10-01 12:10:55 +02:00
Henri Verbeet c0f52fbf1c wined3d: wined3d_device_set_software_vertex_processing() never fails. 2012-09-27 13:10:48 +02:00
Henri Verbeet f9d494294a wined3d: Just return the texture from wined3d_device_get_texture(). 2012-09-27 13:10:43 +02:00
Henri Verbeet c0a83b1d96 wined3d: wined3d_device_get_texture_stage_state() never fails. 2012-09-26 14:40:35 +02:00
Henri Verbeet 26c0714009 wined3d: wined3d_device_set_texture_stage_state() never fails. 2012-09-26 14:40:33 +02:00
Henri Verbeet fc711d4955 wined3d: wined3d_device_set_pixel_shader() never fails. 2012-09-25 11:19:07 +02:00
Henri Verbeet b97ec7ae0c wined3d: wined3d_device_set_vertex_shader() never fails. 2012-09-24 09:58:03 +02:00
Henri Verbeet 2f03ad1a40 wined3d: Just return the declaration from wined3d_device_get_vertex_declaration(). 2012-09-21 10:53:10 +02:00