Henri Verbeet
48580ccd42
ddraw: Use wined3d_texture_get_sub_resource_desc() in ddraw_surface_create().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:11 +09:00
Henri Verbeet
3d2fb4c948
ddraw: Get the texture format from the texture in d3d_device3_SetTexture().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:11 +09:00
Henri Verbeet
3c54eefaca
ddraw: Get the texture format from the texture in d3d_device3_SetRenderState().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Henri Verbeet
8c93a90f78
ddraw: Get the texture format from the texture in d3d_device3_GetRenderState().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Henri Verbeet
5c1976c43b
wined3d: Introduce wined3d_texture_set_sub_resource_parent().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 01:50:10 +09:00
Frédéric Delanoy
3e53214092
ddraw/tests: Use todo_wine_if() in tests.
...
Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-18 01:17:24 +09:00
Henri Verbeet
f984f56fd8
ddraw: Use wined3d_texture_get_sub_resource_parent() in ddraw_surface_create().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-17 13:05:59 +09:00
Henri Verbeet
9d7221b51d
wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields.
...
It's a happy coincidence that none of the surface pointers are actually used.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet
0b6b5176cc
wined3d: Get rid of unused/unimplemented WINEDDBLT_* flags.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:37 +09:00
Henri Verbeet
47635a60a0
ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:36 +09:00
Henri Verbeet
05b84945d5
wined3d: Get rid of the unused _WINEDDOVERLAYFX structure.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-16 12:09:36 +09:00
Henri Verbeet
c6a7284924
ddraw: Disable WINED3D_SRGB_READ_WRITE_CONTROL.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-13 13:22:56 +09:00
Henri Verbeet
3b5eca269d
wined3d: Get rid of the surface parameter to wined3d_device_parent_ops.surface_created().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet
6e5fa92299
ddraw: Use wined3d_texture_get_pitch() in ddraw_surface_init().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-12 23:07:28 +09:00
Henri Verbeet
1b106fe830
ddraw: Use the correct height when calculating the linear size in ddraw_surface_init().
...
This fixes a regression introduced by commit
7d45318aea
.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-10 13:45:02 +09:00
Riccardo Bortolato
b278bb8f56
wined3d: Get rid of wined3d_device_get_surface_from_dc().
...
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:39 +09:00
Henri Verbeet
f0053d06c4
wined3d: Get rid of wined3d_surface_update_overlay_z_order().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:21 +09:00
Henri Verbeet
02008a6f2e
wined3d: Introduce wined3d_texture_update_overlay().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-09 12:19:14 +09:00
Józef Kucia
1769ea38e6
wined3d: Add support for separate sRGB formats.
...
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-02-09 00:37:25 +09:00
Henri Verbeet
ea85a1ca59
wined3d: Introduce wined3d_texture_set_overlay_position().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:53 +09:00
Henri Verbeet
6e30b042e1
wined3d: Introduce wined3d_texture_get_overlay_position().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:40 +09:00
Henri Verbeet
9628db25f6
ddraw/tests: Rewrite rectangle_settings().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:25:24 +09:00
Henri Verbeet
03ef393ae4
ddraw/tests: Rewrite offscreen_test().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:24:39 +09:00
Henri Verbeet
b2b61094e0
ddraw/tests: Rewrite yv12_test().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-06 12:24:23 +09:00
Henri Verbeet
b170952230
ddraw: Use wined3d_texture_get_sub_resource() in ddraw_surface7_Flip().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:49 +09:00
Henri Verbeet
7d45318aea
ddraw: Move the mip-level dimensions fix-up from ddraw_surface_init() to ddraw_surface_create().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-05 13:52:43 +09:00
Henri Verbeet
6037179f6b
ddraw: Use wined3d_rendertarget_view_create_from_sub_resource() in ddraw_surface_get_rendertarget_view().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-04 14:41:44 +09:00
Henri Verbeet
44f2589e7c
ddraw: Use wined3d_resource_unmap() in ddraw_surface7_Unlock().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:38 +09:00
Henri Verbeet
36187987ed
ddraw: Use wined3d_resource_map() in surface_lock().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-03 21:56:32 +09:00
Henri Verbeet
6b2a080372
ddraw: Use wined3d_resource_map() in d3d_texture2_Load().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:39:01 +09:00
Henri Verbeet
7e57924d32
ddraw: Use wined3d_texture_release_dc() in ddraw_surface7_ReleaseDC().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:55 +09:00
Henri Verbeet
83a147d98a
ddraw: Use wined3d_texture_get_dc() in ddraw_surface7_GetDC().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:45 +09:00
Henri Verbeet
88c9ade49c
ddraw: Use wined3d_texture_get_dc() in ddraw_surface_update_frontbuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-02 14:38:39 +09:00
Henri Verbeet
59116f833e
ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad().
...
This is safe because D3D is always initialized in D3D device methods.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:38 +09:00
Henri Verbeet
8ae4580137
ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:37 +09:00
Henri Verbeet
f7e9604c3e
ddraw: Use wined3d_texture_blt() in copy_mipmap_chain().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:37 +09:00
Henri Verbeet
257ee8cc6e
ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:36 +09:00
Henri Verbeet
1a812eb666
ddraw: Use wined3d_texture_blt() in ddraw_surface_blt_clipped().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-01 17:53:36 +09:00
Henri Verbeet
d6e7f18c84
ddraw: Use wined3d_texture_blt() in ddraw_surface7_BltFast().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:15 +09:00
Henri Verbeet
ce882bd6b4
ddraw: Always store a pointer to the wined3d texture in the surface.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-29 21:25:15 +09:00
Józef Kucia
3cffe92315
ddraw: Return DDERR_INVALIDPARAMS for render states >= D3DSTATE_OVERRIDE_BIAS.
...
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-01-29 00:42:26 +09:00
Henri Verbeet
58a7c3cb7d
ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface7_BltFast().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:43:52 +09:00
Henri Verbeet
643f1f1c74
ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_blt_clipped().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:43:49 +09:00
Henri Verbeet
492e785513
ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_update_frontbuffer().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-28 13:43:45 +09:00
Henri Verbeet
ad11f38db9
wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-27 12:38:54 +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
Henri Verbeet
4d94a1e651
ddraw: DDSCAPS_ALLOCONLOAD requires DDSCAPS_TEXTURE.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:54:08 +09:00
Henri Verbeet
6dc5d194ad
ddraw: DDSCAPS_ALLOCONLOAD doesn't override DDSD_LPSURFACE.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:54:04 +09:00
Henri Verbeet
6c9e1a4735
ddraw: DDSD_LPSURFACE requires a non-NULL lpSurface.
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:53:58 +09:00
Stefan Dösinger
4fac292ee8
ddraw/tests: Port test_lockrect_invalid to other versions.
...
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-23 00:56:28 +09:00