system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
109970 commits 3 branches 785 tags 324 MiB
Commit graph

2224 commits

Author SHA1 Message Date
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
Henri Verbeet
521e3a44cf ddraw: Only allow DDSCAPS_MIPMAP on textures. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-06 18:08:39 +01:00
Henri Verbeet
cac1242a63 ddraw/tests: Merge MipMapCreationTest() with test_mipmap_lock(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-06 18:08:38 +01:00
Henri Verbeet
e53567f72a ddraw: Use the largest dimension to determine the mipmap count for version 7 surfaces. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-06 18:08:38 +01:00
Henri Verbeet
9c96a525e7 wined3d: Get rid of unused error codes. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-05 15:45:30 +01:00
Henri Verbeet
6862fc1dd7 ddraw/tests: Don't require a 3D device for test_resource_priority(). 
This fixes commit b0d4502c29.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-05 15:45:04 +01:00
Henri Verbeet
8f91d3ccd8 ddraw: Simplify the root surface test in ddraw_surface7_GetPriority(). 
This fixes commit 97f0345f71. I assume it was
applied by mistake, since it's also missing the correct sign-off.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2016-01-05 15:44:57 +01:00
Stefan Dösinger
dbd93084ce ddraw/tests: Use a slop for test_shademode. 
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-03 20:04:22 +01:00
Riccardo Bortolato
cb03e216e5 ddraw: Check for mipmap sublevel through caps in ddraw_surface7_SetColorKey(). 
Enabled some previously failing tests in ddraw/tests/ddraw7.c.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
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-03 20:03:23 +01:00
Riccardo Bortolato
b0d4502c29 ddraw7/tests: Test GetPriority() on cubemap surfaces. 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-23 09:24:15 +01:00
Riccardo Bortolato
97f0345f71 ddraw: Check if surface is a mipmap sublevel or a non-positive X top level surface through caps in ddraw_surface7_GetPriority(). 
Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com>
Signed-off-by: Stefan Dösinger <stefandoesinger@gmx.at>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-23 09:24:06 +01:00
André Hentschel
c465401984 ddraw/tests: Rename mips to mipmaps. 
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-15 09:12:46 +01:00
Henri Verbeet
571dc0faa5 ddraw: Mark surfaces as lost on mode changes. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-09 01:01:56 +09:00
Henri Verbeet
821c2ed6a3 ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-04 21:56:19 +09:00
Henri Verbeet
1ebb42ca53 ddraw: Mark surfaces as lost when the device window is deactivated. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-04 21:56:19 +09:00
Henri Verbeet
83f10e2251 ddraw: Return DDERR_NOEXCLUSIVEMODE in ddraw_surface7_Flip() when not in exclusive mode. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-04 21:56:19 +09:00
Henri Verbeet
2dca999e33 ddraw/tests: 64-bit ddraw doesn't support textures. 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-01 21:05:12 +09:00
Stefan Dösinger
7e01f865ab ddraw/tests: Test color keys on cube map surfaces. 
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-12-01 21:05:03 +09:00
Andrey Gusev
8bfc9bd2ee Assorted typos fixes. 
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-27 15:38:30 +09:00
Henri Verbeet
af196e5f25 dxgi: Implement dxgi_output_GetDesc(). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-25 13:21:47 +09:00
Hugh McMaster
11669fa5e2 Assorted spelling and grammar fixes. 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-17 22:56:40 +09:00
Matteo Bruni
36800e5217 ddraw/tests: Port test_shademode() to ddraw1. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-13 22:54:20 +09:00
Matteo Bruni
053c190ca1 ddraw/tests: Port test_shademode() to ddraw2. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-13 22:54:17 +09:00
Matteo Bruni
7c1e53e0ac ddraw/tests: Port test_shademode() to ddraw4. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-13 22:54:14 +09:00
Matteo Bruni
1a3d6ad240 ddraw/tests: Port test_shademode() to ddraw7. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-11-13 22:54:11 +09:00
Riccardo Bortolato
f7bf61ea4c ddraw: Remove unused mipmap_level from ddraw_surface. 
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-11-04 14:41:37 +09:00
Michael Stefaniuc
ad4057803d ddraw/tests: Use the proper type for a return value (PVS-Studio). 
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-29 21:20:03 +09:00
Michael Stefaniuc
f8b306c3a8 ddraw/tests: Test the return of DrawPrimitive(). 
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-21 01:04:31 +09:00
Nikolay Sivov
b2855505b9 ddraw: Use proper prototype for internal enumeration callback (PVS-Studio). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-21 01:04:19 +09:00
Nikolay Sivov
8cd2d5df20 ddraw/tests: Use proper type for return values (PVS-Studio). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2015-10-14 12:46:40 +09:00
Riccardo Bortolato
9c00f968d6 d3d8: Make use of wined3d_texture_map in d3d8_surface_LockRect. 
Pass wined3d_texture and sub_resource idx to device_parent_surface_created callback.
Store wined3d_texture and sub_resource in d3d8_surface.
Also updated d3d9, d3d11, ddraw callbacks accordingly.

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-12 23:34:56 +09:00
Riccardo Bortolato
33bb9e9610 wined3d: Don't pass a wined3d_volume to device_volume_created callback anymore. 
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 21:00:07 +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
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
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
9427d1d553 ddraw/tests: Properly clean up in test_texcoordindex. 2015-08-28 19:52:56 +09:00