802f9c7e29
ddraw: Get rid of ICOM_OBJECT.
2009-01-22 12:05:07 +01:00
8c4cc2af46
ddraw: Get rid of ICOM_THIS_FROM.
2009-01-22 12:05:03 +01:00
772e56a2d8
ddraw: Get rid of ICOM_VFIELD_MULTI_NAME and ICOM_VFIELD_OFFSET.
2009-01-21 11:17:41 +01:00
9a0c885e63
ddraw: Get rid of ICOM_INTERFACE.
2009-01-21 11:17:25 +01:00
ad171b143f
ddraw: Get rid of ICOM_INIT_INTERFACE.
2009-01-21 11:16:51 +01:00
4e38c2e943
ddraw: Get rid of ICOM_VFIELD_MULTI.
2009-01-21 11:16:41 +01:00
94c98d0697
ddraw: Get rid of ICOM_VFIELD_MULTI_NAME2.
2009-01-21 11:16:34 +01:00
ba771f0fac
ddraw: Fix Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport().
2009-01-20 12:34:20 +01:00
b2d42ad665
ddraw: Compare the against the correct IID in IDirect3DExecuteBufferImpl_QueryInterface().
2009-01-20 12:34:17 +01:00
2afa23867b
ddraw: Add extern to some global variable declarations.
2009-01-16 13:30:08 +01:00
a966293f59
wined3d: Add an IWineD3DDeviceParent interface.
...
Other than being a bit nicer than passing function pointers all over the
place, this helps dxgi/d3d10. While the swapchain itself is created in dxgi,
its surfaces are constructed in d3d10core, which makes it impractical for dxgi
to pass the appropriate function pointers.
2009-01-16 13:29:32 +01:00
5ee7a104c9
ddraw: Remove superfluous pointer casts.
2009-01-14 12:21:02 +01:00
1ac07906ae
ddraw: Fix double unlock of critical section.
2009-01-10 17:43:10 +01:00
ae4e824423
ddraw[ex]: Show a caps handling difference.
2009-01-09 16:18:12 +01:00
149259d49f
ddraw: Fix an uninitialized variable warning on non-i386.
2009-01-08 17:30:22 +01:00
cc447eac55
wined3d: Move position_transformed out of u.s in struct WineDirect3DVertexStridedData.
2009-01-08 13:21:31 +01:00
352e60e6ed
d3d: Explicitly translate texture stage states.
...
Ddraw and d3d8 already translate half of them, it turns out the lookup
table actually saves lines there.
2009-01-06 12:45:32 +01:00
c51bc826e8
ddraw: Properly handle sampler states.
2009-01-06 12:45:20 +01:00
91bb8dc043
ddraw/tests: Remove superfluous casts.
2009-01-04 13:34:13 +01:00
566a133a82
ddraw/tests: Simplify a pointer increment.
2009-01-04 13:34:05 +01:00
6ef2b65531
ddraw: Reject IDirectDraw3 QI in ddraw.dll.
2009-01-03 15:14:51 +01:00
616ea53226
ddraw: Add a test for IDirectDrawSurface::GetDC.
2009-01-03 15:14:38 +01:00
3b64f895b1
ddraw: Display fixme only once in IDirectDrawImpl_WaitForVerticalBlank.
2009-01-02 11:51:29 +01:00
a537fb0a93
ddraw: Fix surface version setting.
2008-12-26 13:42:29 +01:00
dcbb91fc92
ddraw: Remove a superfluous semicolon.
2008-12-24 19:59:04 +01:00
9605eb5af2
ddraw: Display fixme only once in IDirect3DVertexBufferImpl_Optimize.
2008-12-24 19:57:51 +01:00
26b9f8ef26
ddraw/tests: Fix alpha_test and offscreen_test on geforce 8800 on XP.
2008-12-23 20:12:28 +01:00
a14fe082bf
ddraw/tests: Fis some ok() lines in alpha_test().
2008-12-23 20:11:40 +01:00
8bd9a3aa09
janitorial: Don't depend on user32 for the self registration functions.
2008-12-17 11:38:32 +01:00
ab9f028958
ddraw/tests: Make some functions static.
2008-12-15 12:25:41 +01:00
76b24fd970
ddraw/tests: Fix a test failure on a Win98 VMware box.
2008-12-12 11:38:26 +01:00
1632175b35
ddraw: Fix trace.
2008-12-08 12:02:36 +01:00
ebb31dbbb7
ddraw/tests: Skip tests if we can't create a primary surface.
2008-12-05 13:52:38 +01:00
176c8eb333
ddraw: Remove two superfluous casts.
2008-12-05 12:36:34 +01:00
9d3026ff40
ddraw: Fix some comments.
2008-12-03 09:49:24 +01:00
23abbcb9b3
ddraw: Make some functions static.
2008-12-02 15:27:08 +01:00
a6917b143d
wined3d: Use IDL to generate wined3d.h.
2008-11-25 13:37:22 +01:00
fcfe436de5
ddraw: Remove WINAPI on static functions where not needed.
2008-11-24 14:25:09 +01:00
902bee8f09
ddraw/tests: Skip tests when DirectDraw4 is not supported.
2008-11-12 12:55:09 +01:00
10e5d3aa12
ddraw/tests: Fix a typo.
2008-11-12 12:55:03 +01:00
fbdb78c888
ddraw/tests: Fix a test on W2K3.
2008-11-05 10:54:40 +01:00
092b51e82a
wined3d: Rename CreateAdditionalSwapChain to CreateSwapChain.
2008-10-28 12:46:46 +01:00
7142754820
wined3d: Remove the SDKVersion parameter to WineDirect3DCreate().
2008-10-24 14:24:59 +02:00
99a50b5396
ddraw: Make sure pWineDirect3DCreate and pWineDirect3DCreateClipper match the header.
2008-10-24 14:24:59 +02:00
e1ced22db1
ddraw: Convert source files to utf-8.
2008-10-18 19:19:45 +02:00
8299df900c
ddraw: Remove a few more redundant inits (LLVM/Clang).
2008-10-10 12:27:28 +02:00
ff5a860c0c
ddraw/tests: Use FAILED instead of !SUCCEEDED.
2008-10-08 13:42:11 +02:00
623ee7775b
ddraw: Sign-compare warning fix.
2008-10-01 09:56:54 -05:00
a697d99d66
ddraw: Sign-compare warnings fix.
2008-09-29 17:32:17 -05:00
a12509532c
ddraw/tests: Fix a test on a Win98 box.
2008-09-22 12:16:53 +02:00
7dd099416e
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-09-08 12:47:21 +02:00
55faa6e911
ddraw/tests: Let tests run again on win9x.
2008-09-03 13:14:51 +02:00
09d0a35872
ddraw: Add some overlay tests.
2008-09-02 15:05:59 +02:00
ddec94bf0f
ddraw: Pass proper parameters to CheckDeviceFormat.
2008-09-02 14:56:45 +02:00
c1eabc2ce7
ddraw: Catch attempts to opengl-render to the desktop window.
2008-09-02 14:56:35 +02:00
d5f05c59c7
ddraw: Beware of the surface type when checking for format support.
2008-09-02 14:56:26 +02:00
3b48660f43
wined3d: Implement YV12 support for emulated overlays.
...
This is the prefered format of many codecs, and for some codecs this
is the only supported output format. As usual I try to handle all the
conversion in the GPU and keep the CPU involvement minimal to gain the
full performance of PBO transfers.
2008-09-02 14:55:50 +02:00
ec4955630e
wined3d: Silence some format spam.
2008-08-28 11:24:49 +02:00
58ac095d9d
ddraw: Don't destroy the application's window.
2008-08-26 12:07:40 +02:00
bb67a925d6
ddraw: Only ddraw checks wether one can give a null pointer to SetMaterial.
2008-08-22 11:32:09 +02:00
e718eae9e2
ddraw/tests: Skip cubemap tests when cubemap isn't supported.
2008-08-21 13:35:12 +02:00
a950d3a10e
ddraw: Set the bitdepth on YUV formats.
2008-08-20 12:33:33 +02:00
90e2a676e8
ddraw: Do not set the rendertarget flag just because of the backbuffer flag.
...
There are also overlay backbuffers, which aren't render targets. The
primarysurface and d3ddevice cap flags should be enough here.
2008-08-20 12:32:42 +02:00
e10302d952
ddraw: Implement IDirectDraw7::GetFourCCCodes.
2008-08-19 12:25:37 +02:00
c1bbab7c54
ddraw: Send the ddraw output to the clipper window, if any.
2008-08-19 12:25:31 +02:00
376944ebe4
wined3d: Remove the device-global fullscreen flag.
2008-08-19 12:24:57 +02:00
34b37fe241
d3d: Remove IWineD3DDevice::SetHwnd.
2008-08-19 12:22:05 +02:00
e178ddd9e1
wined3d: Use a swapchain for GDI surfaces.
...
This is a long-needed cleanup aimed at removing the ddraw_primary,
ddraw_window, ddraw_width and ddraw_height members from
IWineD3DDeviceImpl, which just do not belong there. Destination
window and screen handling is supposed to be done by swapchains.
2008-08-19 12:21:32 +02:00
851dd7339e
wined3d: Implement overlay flipping.
2008-08-05 14:09:36 +02:00
e795d842ec
wined3d: Implement overlay position tracking.
2008-08-05 14:09:36 +02:00
a47e7badb9
ddraw: Set ddraw caps in wined3d.
...
Currently the ddraw capabilities were almost static, except of D3D
support. When overlay support is added, the caps depend on certain
settings in WineD3D or capabilities available from OpenGL and Xv. So
set those caps in wined3d as well.
2008-08-04 13:10:11 +02:00
69797d7f3d
ddraw: Fix typo in copy_mipmap_chain.
2008-07-28 14:25:09 +02:00
e2ff077697
ddraw: Improve IDirect3DDevice7_Load implementation.
...
Copies palette and colorkey earlier in the helper function, before
copying image, also skips UpdateSurface when palette is missing. This
prevents unnecessary surface (re)loads in wined3d, and gets rid of
some wined3d palette error messages in Sacrifice.
2008-07-22 15:20:33 +02:00
2be93ce6b0
ddraw/tests: Add tests for surface caps memory flags.
2008-07-17 11:21:48 +02:00
59fc5a75e0
ddraw: Force surfaces without memory flags to video memory on creation.
...
Also removes now redundant setting of vidmem flag on rendertargets, prevents
adding vidmem flag when sysmem flag is present. Fixes missing textures in Forsaken.
2008-07-17 11:21:39 +02:00
79c64acc7b
tests: Don't depend on the static uuid libraries in the tests.
...
This avoids trouble with the broken MingW libraries when
cross-compiling the tests.
2008-07-08 17:51:45 +02:00
11e31e580c
ddraw: Fix a failing test for broken drivers.
2008-07-02 12:05:08 +02:00
8830dbcca8
ddraw: Fix a failing test for broken drivers.
2008-07-02 12:04:56 +02:00
cb5e06c944
ddraw: Implement FPU mode fixup in d3d7 device.
...
As documented in DirectX7 SDK, d3d7 devices set FPU mode (control word) on every
call and restore it back to original state before returning, if created in
DDSCL_FPUPRESERVE cooperative mode. This allows games to work with FPU in a
possibly incompatible mode and avoid resetting it all the time.
2008-06-23 19:59:33 +02:00
606186d4c5
ddraw: Ensure to load wined3d before attempting to create a clipper.
2008-06-23 14:11:58 +02:00
5dcec4de49
ddraw: Reset the viewport data before each test.
2008-06-18 13:51:46 +02:00
2cf47c00f2
ddraw: Avoid a not needed address-of operator.
2008-06-06 10:29:09 +02:00
7352978713
ddraw: Delete the temporarily attached surface.
2008-06-02 12:35:14 +02:00
476cb96b75
ddraw: Remove trailing spaces in Wine traces.
2008-05-30 10:01:11 +02:00
940ef7a9ff
ddraw: Do not return modes differing only by refresh rate without DDEDM_REFRESHRATES.
2008-05-29 12:09:19 +02:00
a2b645128f
ddraw: Test for IDirect3DTexture_Load of Texture into itself.
2008-05-28 19:31:35 +02:00
46ef2e06fc
ddraw: IDirect3DTextureImpl_Load failed when texture was loading onto itself.
2008-05-28 19:31:29 +02:00
f076d79c6c
ddraw/tests: Don't crash on win9x.
2008-05-28 11:32:24 +02:00
8019c55cc6
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-05-21 11:36:39 +02:00
5bf9e88cce
ddraw: Memory allocation size fix.
2008-05-13 10:40:00 +02:00
17dacf90b2
ddraw: Fix some code unprotected by ddraw lock.
2008-05-12 19:41:46 +02:00
ebf1f4e6bb
ddraw/tests: Add KEYSRCOVERRIDE test in p8_primary_test.
2008-05-09 11:19:43 +02:00
a6746b9e7b
ddraw: Indentation fix.
2008-05-07 12:24:04 +02:00
42a61d7ed7
Assorted spelling fixes.
2008-05-06 16:10:20 +02:00
c4d75213ab
ddraw/tests: Add tests for IDirect3DDevice7_Load.
2008-05-06 11:26:24 +02:00
d6ecf5d14d
ddraw: Return DDERR_NOCOLORKEY when there is no colorkey.
2008-05-06 11:26:15 +02:00
7e8be9ecc0
ddraw: Add full implementation of IDirect3DDevice7_Load.
2008-05-06 11:26:10 +02:00
30221f7bcd
ddraw: Fix some texture blending modes.
2008-05-05 19:55:30 +02:00
8f72961e50
ddraw: Move handling of D3DRENDERSTATE_TEXTUREMAPBLEND from d3ddevice2 to d3ddevice3.
2008-05-05 19:55:13 +02:00
edaaf63bd6
ddraw: Move handling of D3DRENDERSTATE_TEXTUREHANDLE from d3ddevice7 to d3ddevice3.
...
As supported by tests, there is no reason for this state to be handled by
d3ddevice7, and moving it to d3ddevice3 prepares for the changes in next patch
(setting TEXTUREHANDLE state can then go through SetTexture of d3ddevice3).
2008-05-05 19:55:05 +02:00
d5db7615a2
ddraw/tests: Add test for deprecated render states in d3d7.
2008-05-05 19:54:48 +02:00
feb753c98d
ddraw: Enable EnableAutoDepthStencil to receive depth support.
2008-05-02 11:33:38 +02:00
dad21bbcbf
makefiles: List the static libraries as normal imports instead of extra libs.
2008-04-30 14:23:55 +02:00
cf38e4c930
ddraw: Fixed device name.
2008-04-28 14:33:57 +02:00
404afbaa3c
ddraw: Remove a test that fails in VMs.
2008-04-28 13:27:51 +02:00
2f97a71e36
ddraw: Fix tests that fail with the reference rasterizer.
2008-04-25 14:53:17 +02:00
6edfd10868
ddraw: Remove unused variables.
2008-04-18 13:57:15 +02:00
4ba16af16b
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-04-14 12:40:22 +02:00
df422cf0fb
ddraw/tests: Add colorkeyed blit to p8_primary_test.
2008-04-11 13:05:12 +02:00
d8ae8a8780
ddraw/tests: Add viewport clearing tests.
2008-04-11 13:05:03 +02:00
44143a97c7
ddraw: Temporarily activate viewport when clearing.
2008-04-11 13:04:34 +02:00
3e237c6199
ddraw: Set active_device in AddViewport.
2008-04-11 13:04:26 +02:00
6a48e405db
ddraw: Add possibility to ignore lights in viewport_activate.
...
Mostly NOP regarding existing functionality, but makes it possible to skip light
activation when it's not needed (like when clearing).
2008-04-11 13:04:19 +02:00
0d0c4a355b
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-04-07 13:36:18 +02:00
f4c4488df8
Spelling fixes.
2008-04-07 13:36:17 +02:00
18b9c2bb83
ddraw/tests: Extend p8_primary_test.
...
Additional tests for blitting and locking.
2008-04-04 11:43:45 +02:00
825baa23a2
ddraw: Spelling fixes.
2008-04-03 11:39:45 +02:00
003f679cbe
ddraw/tests: Additional colorfill test in p8_primary_test.
2008-04-03 11:31:32 +02:00
2caa797e76
ddraw: Set surface to NULL on failure in GetAttachedSurface.
2008-04-03 11:30:30 +02:00
2e26c176ec
ddraw: Pass the NULL rectangle to IDirectDrawSurface::Unlock.
2008-04-02 20:29:17 +02:00
c1503a2579
ddraw: Remove some leftover test debug output.
2008-04-02 20:29:09 +02:00
ab7630fbe3
ddraw: Add a D3D7 cube map test.
...
The DirectDraw cube mapping interface has a few pitfalls. So far we have
a test testing the surface enumeration, this adds a rendering test. So
far everything used in the test works.
2008-04-02 20:29:01 +02:00
4066c2e2fd
ddraw: Do not fail if D3D is not available.
2008-04-01 20:31:51 +02:00
0ab270e41a
ddraw/tests: Initialize ddprimpal.
2008-03-28 14:49:17 +01:00
ee13cc4903
ddraw: Some EnumZBufferFormat fixes.
2008-03-27 11:10:29 +01:00
8662bd7555
ddraw: Fix some Z buffer formats.
2008-03-27 11:10:20 +01:00
eab196b35a
ddraw: Remove trailing spaces in ok() calls.
2008-03-27 11:05:40 +01:00
8869c0f147
d3d: De-pointerize the WINED3DCAPS structure.
2008-03-25 19:36:38 +01:00
a40185f12f
ddraw: Don't clear the return value anymore, we fill the fields anyway, also a test for the behaviour.
2008-03-25 12:50:33 +01:00
7a012df64d
ddraw/tests: Add test for ddraw 8-bit mode.
...
Adds rudimentary test for 8 bit mode ddraw (palettized primary surface). Tests
things like GetDC and its palette handling and SetPalette affected by patches
that follow.
2008-03-25 11:53:06 +01:00
c8837b8205
ddraw: DDRAW_dump_flags_nolf must not add LF.
2008-03-25 11:45:05 +01:00
e2d8e291d6
ddraw: Fix vertex processing.
2008-03-24 20:41:19 +01:00
eddbdbef47
ddraw/tests: Test executebuffer triangle instruction with zero count.
2008-03-24 20:40:18 +01:00
bacd2340b4
ddraw/tests: Test SetPalette on non-palettized surfaces.
2008-03-24 20:40:05 +01:00
4b53dde0f5
ddraw: Make SetPalette fail for non-palettized surfaces.
2008-03-24 20:40:00 +01:00
41310080a5
ddraw: Use a correct resource type and a valid format.
2008-03-21 15:20:21 +01:00
49c682470c
ddraw: Fix refcounting of palettes.
2008-03-17 15:16:03 +01:00
248ae8f112
ddraw: Implement ForceRefreshRate registry entry for overriding DirectX refresh rate.
2008-03-11 15:30:37 +01:00
4188af790a
ddraw: Fix diffuse and specular color types.
2008-03-06 12:46:46 +01:00
9381f22653
ddraw/tests: Don't use 0xaa to avoid any confusion when running with +heap.
2008-03-05 12:18:36 +01:00
48000893f9
makefiles: Simplify the use of the IMPORTLIB variable in the DLL makefiles.
...
Only specify the root to keep platform-specifics out of the individual
DLL makefiles.
2008-03-04 20:55:01 +01:00
069b9c8c1c
ddraw: Catch No-op SetRenderTarget operations.
2008-03-03 20:45:54 +01:00
26ad93947b
janitorial: Remove links to any microsoft site.
2008-03-01 12:04:09 +01:00
f2b77031c3
ddraw: Don't use typeof as it's not portable.
2008-02-27 14:52:24 +01:00
df5116cc7d
ddraw: Return a nullpointer as lpSurface in Lock() if the rect is invalid.
2008-02-25 19:50:30 +01:00
e2d70fff6b
ddraw: Add yv12 detection support.
2008-02-22 12:04:01 +01:00
29d87c6cbf
ddraw/tests: Add a test of D3DTBLEND_MODULATE with P8 texture.
2008-02-21 12:53:00 +01:00
9af59fb7f0
ddraw: Release interfaces when exiting with error.
2008-02-21 12:53:00 +01:00
1eb52667ac
ddraw/tests: Avoid endless loop, when T&L is not supported.
2008-02-20 12:06:28 +01:00
01cba07624
ddraw: Add missing unlock on error path. Found by Smatch.
2008-02-19 20:54:50 +01:00
74c380cb7b
ddraw/tests: Add test for palette handling in IDirect3DTexture_Load.
2008-02-19 13:39:24 +01:00
cfa40a22c9
ddraw/tests: Split d3d1 initialization and destruction into separate functions.
...
Slight rewrite to make creating additional D3D1 tests easier.
2008-02-19 13:39:23 +01:00
ed44f9d130
ddraw: Fix palette handling in IDirect3DTexture_Load.
...
This fixes a potential refcounting problem and makes the function fail with NULL
destination texture's palette and non-NULL source palette like it does on native.
2008-02-19 13:39:17 +01:00
ddd0ec1670
ddraw/tests: Add test for branch instruction with non-zero offset.
2008-02-19 12:06:50 +01:00
4981eda895
ddraw: Fix executebuffer branching with non-zero offset.
...
Fixes a crash in Moto Racer 2.
2008-02-19 12:06:38 +01:00
1079f37407
wined3d: When DDCAPS_ALLOW256 is set, palette entry 0 and 255 are filled with black and white.
2008-02-19 12:06:25 +01:00
4c8e218252
Assorted spelling fixes.
2008-02-15 12:09:24 +01:00
8354995482
ddraw: Spelling fixes in the d3d test output.
2008-02-06 13:49:45 +01:00
8ad3a1f49e
ddraw: Some drivers return a refresh rate of 0.
2008-02-06 12:43:53 +01:00
20b41af9f1
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-02-05 12:19:37 +01:00
d0794c4aeb
Assorted spelling fixes.
2008-01-23 21:16:22 +01:00
8bbb3d68e1
ddraw: Register the DirectDraw 7 Object.
2008-01-23 11:31:42 +01:00
320e253805
ddraw/tests: Add test for D3DTBLEND_MODULATE.
2008-01-22 11:19:34 +01:00
6810ebb4c1
ddraw: Fix handling of alpha with D3DTBLEND_MODULATE.
2008-01-22 11:19:18 +01:00
44b52b128c
Assorted spelling fixes.
2008-01-16 12:48:29 +01:00
7478d9c44d
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2008-01-16 12:46:09 +01:00
d14ef91c92
ddraw/tests: Add test for rendering vertices with zero rhw.
2008-01-08 12:53:31 +01:00
6e8b7c4cef
ddraw: Add missing pitch in callback from EnumDisplayModes().
2008-01-04 13:55:12 +01:00
f074c0e162
ddraw: Remove unneeded casts.
2008-01-02 12:38:41 +01:00
18143f693b
ddraw: Remove redundant iface<->impl casts in IDirect3DTextureImpl_Load.
...
The implementation pointer retrieved from interface ptr wasn't being used for
anything except retrieving same interface ptr back.
2007-12-31 17:48:39 +01:00
9dbdacbd82
ddraw: Release palette interfaces.
2007-12-31 17:48:16 +01:00
f4337b4714
ddraw: Fix incorrect WARN text.
2007-12-17 12:38:43 +01:00
05170942de
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-12-10 12:06:09 +01:00
4051a09eb2
ddraw: Fix wrong initialization order in IDirect3DDevice vtable.
2007-12-08 19:54:51 +01:00
f700cbe74b
wined3d: Add an alpha blending test.
2007-12-07 16:26:43 +01:00
f29d947f6a
ddraw: Set X8R8G8B8 for 32 bpp.
2007-12-07 16:26:31 +01:00
90834020da
ddraw: Modify DDRAW_dump_(DWORD|PTR|DDCOLORKEY|DDSCAPS2|pixelformat)() to print a trailing '\n'.
2007-12-07 14:52:56 +01:00
6a8f961e08
ddraw: Rename DDRAW_dump_flags_() to DDRAW_dump_flags_nolf() to clarify its difference from DDRAW_dump_flags().
2007-12-07 14:52:51 +01:00
1f73a97a5a
ddraw: Remove unneeded casts.
2007-12-06 12:07:41 +01:00
63f4b6f024
ddraw: DPRINTF -> TRACE.
2007-12-05 12:34:33 +01:00
3cc253c557
wined3d: Enabling too many lights is silently ignored.
...
I'm resending this patch because my reply to Henri's concern came too late.
Henri noted that I am enabling lights that do not exist. Existing tests show
that if no light is assigned to the index, LightEnable creates a light with a
set of default parameters, so the tests should be fine.
From 9ee4c61805b50886f79e87d744b52f27b7b00b4e Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan@codeweavers.com>
Date: Thu, 29 Nov 2007 13:22:47 +0100
Subject: [PATCH] WineD3D: Enabling too many lights is silently ignored
This patch adds tests for all d3d versions that show that Windows
pretends that enabling more lights than supported succeeds. D3D_OK is
returned, and the light is reported as enabled.
What is not tested in this patch is the rendering output of this
situation, thus the FIXME is still written.
2007-12-03 13:44:07 +01:00
714991bf3f
ddraw: Fix a test for Vista.
2007-11-07 12:08:07 +01:00
f9dba29477
ddraw: Be less picky about float precision.
2007-11-07 12:08:00 +01:00
0d016254a0
wined3d: Don't test D3DDEVICE surfaces in dsurface tests.
2007-11-05 13:24:36 +01:00
848650d908
ddraw: Downgrade the SetCooperativeLevel FIXME to a TRACE.
2007-10-10 11:59:33 +02:00
7a445747ea
ddraw: Do not fail on surface creation errors, skip instead.
2007-10-10 11:59:26 +02:00
c5055fb3eb
ddraw: Cope with Init3D failures.
2007-10-10 11:58:37 +02:00
03fa9f8730
ddraw: Fix RegDeleteTreeA/W compile issues when building ddraw for Windows.
2007-10-01 14:17:09 +02:00
b78736a4bb
ddraw: Remove 'recursive registry key delete' function.
2007-09-25 11:19:03 +02:00
019cc506a8
ddraw: Enumerate additional devices in IDirect3D7_EnumDevices.
2007-09-10 16:47:30 +02:00
c53487b599
ddraw: Fix and test case for situation where DDSD_MIPMAPCOUNT is set and dwMipMapCount is 0.
2007-09-10 15:29:46 +02:00
d0fdb1ea7e
d3d: Add a test for double surface locking.
2007-08-31 11:25:19 +02:00
a06e002e93
wined3d: Add a wined3d private WINED3DSBT_RECORDED.
2007-08-15 09:36:20 +02:00
5b375aec71
ddraw: Better match the PSDK types and fix the winapi_check warnings.
2007-08-08 15:32:03 +02:00
2d15cb8b27
d3d: Add a simple offscreen rendering test.
2007-08-08 15:32:00 +02:00
89dccc7c7c
ddraw: Implement IDirect3DDevice7::DrawIndexedPrimitiveStrided.
2007-08-08 15:32:00 +02:00
df75a7e007
ddraw: SetDisplayMode may fail.
2007-08-03 12:30:21 +02:00
1f4d71c0f6
ddraw: Some drivers return DDERR_INVALIDPARAMS if DXTn surfaces aren't supported.
2007-08-03 12:30:03 +02:00
5266e57975
Assorted spelling fixes.
2007-07-31 21:37:50 +02:00
17f1c29457
ddraw: Table fog may be unsupported.
2007-07-30 23:37:58 +02:00
47c847663e
ddraw: Remove thread safety FIXMEs.
2007-07-30 12:59:47 +02:00
430239b470
ddraw: Some d3d-only code fixes.
...
Vertex declarations are a d3d feature, thus they should be destroyed
before d3d is shut down in wined3d. The surface type should be reset
afterwards to prevent avoid gl surface afterwards and before a new
render target is created.
2007-07-24 13:40:29 +02:00
382329c103
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-07-09 11:45:53 +02:00
def7122f3c
ddraw: Y coords are inversed.
2007-07-06 19:29:48 +02:00
f7597dee15
ddraw: Update the wined3d matrix if a current matrix handle is modified.
2007-07-06 19:29:39 +02:00
a470ea6205
ddraw/tests: Use skip instead of trace.
2007-07-06 18:15:32 +02:00
c92026739e
ddraw/tests: Use skip instead of trace.
2007-07-06 18:15:26 +02:00
a3317a5c01
Assorted spelling fixes.
2007-07-05 19:56:34 +02:00
090fd6d9d2
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-07-05 19:54:58 +02:00
e4bf7ab578
ddraw: Implement IDirect3DViewport3::TransformVertices.
2007-07-05 19:52:27 +02:00
125b9b7dcf
ddraw: Read the world matrix correctly.
2007-07-05 19:52:09 +02:00
5fa4de27bc
ddraw: D3DOP_BRANCHFORWARD includes the current instruction size.
...
Native D3DRM puts a branchforward with offset 0 at the beginning of each
execute buffer. With the old code this used to get stuck in an endless
loop. This patch adds a test that shows that such a branchforward
terminates properly.
2007-07-05 19:52:01 +02:00
c58b2f2283
ddraw: Materials in the execute buffer are handles.
2007-07-05 19:50:43 +02:00
c0cc4d4219
ddraw: Fix an incorrect iface->impl cast.
2007-07-05 19:50:32 +02:00
58fb9dd5c0
ddraw: Z buffers can be attached to offscreen d3d devices.
2007-07-03 12:32:42 +02:00
7a7f416ace
ddraw: Don't link against X libraries.
2007-06-26 17:44:36 +02:00
d6c2e6f067
ddraw: Fix missing unlock on an error path. Found by Smatch.
2007-06-26 11:57:56 +02:00
4f8eb6a32e
wined3d: Clamp material power to 128.0.
2007-06-25 20:03:26 +02:00
73032be74a
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-06-25 13:25:39 +02:00
fb269f9210
wined3d: Depthfill blits are allowed between BeginScene and Endscene.
2007-06-22 13:42:51 +02:00
208d38688a
ddraw: Check for incorrect rectangles to DDrawSurface::Blt.
2007-06-22 13:42:30 +02:00
e019cebd16
ddraw: Add a test for incorrect surface desc sizes for Lock().
2007-06-22 13:42:24 +02:00
bf23e5f3f7
ddraw: Test for incorrect surface desc sizes in GetSurfaceDesc.
2007-06-20 15:10:58 +02:00
785771272a
wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead.
2007-06-06 12:10:47 +02:00
974784cde0
ddraw: Hold the Lock in IDirect3DViewport methods.
2007-06-05 12:22:23 +02:00
f45684d547
ddraw: Hold the lock in IDirect3DVertexBuffer methods.
2007-06-05 12:22:14 +02:00
9aab44ded5
ddraw: Hold the lock in IDirect3DTexture methods.
2007-06-05 12:22:03 +02:00
6eb8e3fb6f
ddraw: Hold the lock in IDirect3DLight methods.
2007-06-05 12:21:53 +02:00
a2227de7af
ddraw: Hold the lock in IDirectDrawPalette methods.
2007-06-05 12:21:44 +02:00
d0de7e72ec
ddraw: Hold the lock in IDirect3DMaterial methods.
2007-06-04 12:53:09 +02:00
e38439bdfe
ddraw: Hold the lock in IDirectDrawGammaControl methods.
2007-06-04 12:53:01 +02:00
0086d490a9
ddraw: Hold the lock in IDirectDrawClipper methods.
2007-06-04 12:52:56 +02:00
d5d7d4dae4
ddraw: Hold the lock in IDirect3DDevice methods.
2007-06-04 12:52:40 +02:00
ed3f6e8d32
ddraw: Hold the lock in IDirect3DX methods.
2007-05-31 13:07:54 +02:00
94127492f2
ddraw: Check the validy of IDirectDrawSurface::BltFast parameters.
2007-05-31 13:07:38 +02:00
8b6a3610bb
ddraw: Hold the lock in IDirectDrawSurface methods.
2007-05-31 13:07:28 +02:00
fa48cb042c
Assorted spelling fixes.
2007-05-29 13:47:18 +02:00
30b7744472
ddraw/tests: Fix the Visual C++ double to float conversion warnings.
2007-05-29 13:47:03 +02:00
77440b098f
ddraw/tests: Fix compilation with Visual C++ 2005.
2007-05-29 13:44:35 +02:00
47b6392b44
ddraw: Fix the name of DDSPD_IUNKNOWNPOINTER.
2007-05-29 13:17:42 +02:00
fb0a9291ea
ddraw: Do not crash when Clipper is NULL.
2007-05-29 11:55:58 +02:00
83ba2c762d
ddraw: Hold the dll lock in IDirectDraw methods.
2007-05-21 19:12:19 +02:00
bfe631dfb9
ddraw: Hold the lock in creation functions.
2007-05-21 19:11:34 +02:00
5307dd2029
ddraw: Make the ddraw list lock a global dll lock.
2007-05-21 19:11:22 +02:00
0acb5810bf
Assorted spelling fixes.
2007-05-15 18:09:16 +02:00
b7ac570f39
ddraw/tests: Check for failing to create surfaces.
2007-05-14 15:41:21 +02:00
72ed214932
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-05-14 14:25:10 +02:00
4295b18950
ddraw: Avoid fallout of failing tests.
2007-05-11 11:26:34 +02:00
5c48d504fc
wined3d: Destroying the resource frees all private data.
...
Also adds a test for ddraw, d3d8 and d3d9.
2007-05-11 11:22:31 +02:00
a5c484cbf3
ddraw: GetSurfaceDesc returns the surface memory while the surface is locked.
2007-05-11 11:21:44 +02:00
e7b68eec34
ddraw: Use point filter for blit operations.
...
D3DTEXF_NONE is a special value for mipmapping which disabled
mipmapping, but it is not a valid mag / min filter parameter.
D3DTEXF_POINT is what we want
2007-05-11 11:21:29 +02:00
6e22f03654
ddraw: Remove all non-d3d7 capability flags.
2007-05-11 11:21:11 +02:00
1b94a5eefd
ddraw: Fix stupid bug when setting surface client memory.
2007-05-10 11:40:50 +02:00
df891b823a
ddraw: Always set fullscreen mode in wined3d.
...
DDSCL_NORMAL is not set at initialization. Instead of making this a
& DDSCL_NORMAL || == 0 check just set fullscreen mode always. WineD3D
will catch NOP changes anyway.
2007-05-10 11:40:40 +02:00
d9fef10b71
ddraw: Some caps fixes.
...
Cards at DirectX7 times did not support non power of 2 textures, and
some games check the capatiblity flags incorrectly. Rollcage expects the
D3DPTEXTURECAPS_POW2 (limitation) flag set and fails with the reference
rasterizer which support NP2 textures and doesn't have the cap set.
2007-05-10 11:40:01 +02:00
bed50115ee
ddraw: More tests and fixes on surface attachments.
2007-05-09 12:07:46 +02:00
28170f0474
wined3d: Implement environment bump mapping with GL_ATI_envmap_bumpmap.
2007-05-09 12:07:32 +02:00
9b867f4d91
ddraw: Forward the mag filter correctly to wined3d.
...
Fixes the erros when using anisotropic mag filtering in the d3d7
filter demo.
2007-05-08 18:28:29 +02:00
0fb41a8845
wined3d: Make the blit -> flip work for windowed rendering.
2007-05-08 18:28:08 +02:00
d93e161b1f
d3d: Move clippers from DDraw to wined3d.
2007-05-08 18:27:44 +02:00
00028b0c37
ddraw/tests: Fix typos in messages.
2007-05-08 13:25:55 +02:00
00e37a81b2
ddraw: Primary surfaces always have screen size.
2007-05-07 21:43:09 +02:00
742260d418
ddraw: Adjust the d3d viewport when changing the back buffer.
...
WineD3D sets up the viewport according to the front buffer, so this
needs to be changed to the values of the render target passed when the
d3d7 device is created and this device turns out not to be the known
front or back buffer.
2007-05-07 21:42:59 +02:00
2ecacc619f
ddraw: Fix reported caps on compressed surfaces.
...
Compressed surfaces in ddraw do not have a pitch, instead the full
surface size is reported. Also adds tests for the extact behavior and
surface flags set.
2007-05-07 21:42:33 +02:00
26553b6c1d
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-05-07 14:30:14 +02:00
0b9808761f
ddraw: Add a surface locking test.
2007-05-04 13:41:37 +02:00
7b48db196f
d3d: Fix the surface locking rectangle validation.
2007-05-04 13:41:13 +02:00
6acc0a151d
ddraw: Forward all 4 world matrices to wined3d.
2007-05-03 14:24:26 +02:00
d913744f1e
d3d: Calculate the size of WINED3DFVF_XYZBx FVFs.
2007-05-03 14:24:16 +02:00
ffae39c3f3
ddraw: Update the wined3d depth stencil on device creation, render.
2007-05-01 11:42:25 +02:00
378005442e
ddraw: Cube map structure test.
2007-05-01 11:42:25 +02:00
cdaf29f64e
ddraw: Cube texture support.
2007-05-01 11:42:25 +02:00
94b3fddec8
d3d: Pass the cube face to Create*Texture's surface creation callback.
2007-05-01 11:42:25 +02:00
7ca369d9b6
ddraw: Store a WineD3DBaseTexture instead of a WineD3DTexture.
2007-05-01 11:42:24 +02:00
0629946e65
ddraw: Exclude unused headers.
2007-05-01 11:42:24 +02:00
5a8fc34033
Assorted spelling fixes.
2007-04-30 12:35:11 +02:00
a61e58dbf4
ddraw: Add a test for surface attachments.
2007-04-30 12:22:14 +02:00
9e3e799ca3
ddraw: Complex surfaces form a tree.
2007-04-30 12:22:06 +02:00
87544190a5
ddraw: Move the additional surface creation into a seperate function.
2007-04-30 12:21:21 +02:00
d30c25be83
ddraw: Do not access the surface connection structure directly in SetPalette.
2007-04-30 12:21:09 +02:00
b4d48c7fce
ddraw: Search for d3d primary a bit differently.
2007-04-30 12:20:56 +02:00
88af9702f1
ddraw: Use EnumAttachedSurfaces for SetColorKey.
2007-04-27 11:43:45 +02:00
a46012eff2
ddraw: Search for texture sublevels with GetAttachedSurface.
2007-04-27 11:43:36 +02:00
c2ffffe1ff
ddraw: Use EnumAttachedSurfaces to search for a render target.
2007-04-27 11:43:27 +02:00
86eb79b0c9
ddraw: Add a test for EnumSurfaces.
2007-04-27 11:43:17 +02:00
460f71dcf8
d3d: Fix ProcessVertices.
...
IDirect3DDevice9::ProcessVertices takes a vertex declaration, not a
vertex buffer. The source for ProcessVertices is taken from the
stateblock, not the vertex declaration.
2007-04-26 14:54:29 +02:00
0386eed91f
ddraw: Get rid of FVFs.
...
Remove all IWineD3DDevice::SetFVF calls and instead create converted
vertex declarations and use them. The idea is to remove the FVF paths
from wined3d to simplify the code, and optimize the vertex declaration
codepath.
2007-04-26 14:54:17 +02:00
e4253fd8b9
ddraw: Constify some variables.
2007-04-23 14:42:06 +02:00
725057da47
d3d: Remove dependency on ddraw.h header.
2007-04-16 13:20:15 +02:00
8a5b6df483
d3d: Enumerate palettized formats for ddraw.
2007-04-16 12:12:34 +02:00
290f2eb146
wined3d: Add Filtering to IWineD3DSurface::Blt and handle it.
...
This is to allow StretchRect to pass the texture filter to WineD3D.
DirectDraw sets the texture filter to WINED3DTEXF_NONE, simmilar to all
other functions which do not need filtering.
2007-04-07 10:58:10 +02:00
1d4a4b75bc
ddraw: When changing the back buffers also update the render target.
2007-03-29 21:00:25 +02:00
d9e8a0f63e
Remove unneeded checks on the GetModuleHandle() return value for cases where we are linked with the dll.
2007-03-28 12:36:13 +02:00
4eb936db33
ddraw: Replace inline static with static inline.
2007-03-20 13:00:45 +01:00
8f14d4639d
wined3d: Fix struct size calculation in EnumTextureFormats.
2007-03-19 12:23:29 +01:00
022e884342
wined3d/ddraw: Forward DDSCL_MULTITHREADED to wined3d.
2007-03-19 12:17:18 +01:00
4b445124d3
direct3d: Add a fixed function fog test.
2007-03-15 12:14:50 +01:00
51a7ca3440
Change some functions arguments from () -> (void).
2007-03-12 12:25:31 +01:00
4a1435aa79
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-03-05 12:13:20 +01:00
4a16dbbbec
wined3d: More Clear fixes.
...
Test for rectangles with x1 > x2 and y1 > y2. Empire earth passes such rects.
2007-02-27 12:20:10 +01:00
a98b9d76c6
ddraw/tests: Fix compilation on systems that don't support nameless unions.
2007-02-26 17:34:06 +01:00
dbbef46e5a
ddraw/tests: There is no unnamed union in D3DLIGHT7.
2007-02-26 17:34:04 +01:00
efc03f0a34
wined3d: Index buffer fixes.
2007-02-21 10:57:08 +01:00
76b7cac7af
wined3d: Light parameter fixes.
2007-02-21 10:55:31 +01:00
93494f2ac0
Assorted spelling fixes.
2007-02-20 20:30:51 +01:00
bbcf98209c
wined3d: No bounds checking is done on sampler / texture numbers.
2007-02-20 11:49:42 +01:00
27113156d9
wined3d: Remove IWineD3DDevice::EnumDisplayModes.
2007-02-20 11:47:46 +01:00
cd3bc1d17d
ddraw: Test and fix IDirectDrawSurfaceX::GetDDInterface.
2007-02-19 13:09:30 +01:00
1036ca0df6
ddraw: Creating surfaces with old interfaces doesn't addref.
2007-02-19 13:09:18 +01:00
68e7ed2c90
ddraw: Fix a leak in a test.
2007-02-19 13:09:04 +01:00
ae91cfe380
ddraw: SetClipper refcounting fix.
2007-02-19 13:08:55 +01:00
266fc77cf0
wined3d: Lighting is calculated for vertices without normals.
...
It still should be disabled for transformed vertices though.
2007-02-19 13:08:35 +01:00
03bc11fa16
wined3d: Visual test framework.
2007-02-19 13:07:44 +01:00
a4bc52a89c
wined3d: Fix WINED3DPRESENT_PARAMETERS and use it instead of D3DPRESENT_PARAMETERS.
2007-02-16 12:31:03 +01:00
3b3e865366
ddraw: Handle mipmapped mag filters by ignoring the mipmap parameter.
2007-02-15 16:55:52 +01:00
c3d3dcec81
ddraw: Handle mipmapped TEXTUREMIN render states.
2007-02-15 16:55:45 +01:00
7c40f9aaa2
ddraw: Forward D3DRS_TEXTUREADDRESS* and D3DTSS_ADDRESS* to sampler states.
2007-02-15 16:55:33 +01:00
8b8e30b1e1
ddraw, wined3d: Color keying tests and fixes.
2007-02-15 11:37:00 +01:00
388499ff28
wined3d: More fullscreen window fixes.
2007-02-14 20:46:51 +01:00
67b1f4a7e9
wined3d: BeginScene and EndScene tests and fixes.
2007-02-12 12:08:34 +01:00
6112522122
wined3d: Move SetupFullscreenWindow() and RestoreWindow() from IDirectDrawImpl to IWineD3DDeviceImpl.
2007-01-19 12:28:58 +01:00
d4ca34dd9b
d3d: Fix the D3DFMT_XXX constant declarations.
2007-01-18 12:05:05 +01:00
1d3abdeeaa
wined3d: Store the stream number in the strided structure.
2007-01-17 11:23:54 +01:00
3d14118fb7
ddraw: Get some texture stage states from their equivalent sampler states.
2007-01-10 22:01:31 +01:00
33af3c5c83
janitorial: Use the C standard for multiline strings.
2007-01-10 12:28:19 +01:00
4e8e47fc6c
ddraw: Forward the DDSCAPS2_TEXTUREMANAGE flag to wined3d.
2007-01-08 20:59:29 +01:00
3581d8e8d8
wined3d: Do not keep internal references on vertex buffers.
2007-01-08 20:59:06 +01:00
386fdd81e9
ddraw: Declare some functions static.
2007-01-04 21:14:08 +01:00
7c95df77ae
ddraw: Declare some functions static.
2007-01-04 09:55:15 +01:00
71631f7638
wined3d: Use the baseVertexIndex in the stateblock.
2007-01-03 11:02:51 +01:00
b1cc8bec82
ddraw: Fix the AddViewport thunk.
2007-01-03 11:01:12 +01:00
656fc93815
Use GetDC instead of CreateDC where possible.
2007-01-02 17:16:36 +01:00
c7e00c9f49
janitorial: In multiline strings there is no need for '\' at the end of the lines.
2006-12-27 13:10:13 +01:00
8485eb02dc
ddraw: Add a test for IDirectDrawSurface_SetColorKey.
2006-12-21 11:25:05 +01:00
5e0fc62135
d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice.
2006-12-18 12:07:26 +01:00
325f666fc5
ddraw: IDirectDraw3 should use its own ref count variable.
2006-12-16 17:01:52 +01:00
f26cb44c73
ddraw: Initialize the IDirectDraw3 vtable.
2006-12-16 17:01:46 +01:00
2a63a03eb1
wined3d: When changing display modes clip cursor to the requested display size.
2006-12-15 13:44:36 +01:00
8836dea139
ddraw: Fix warnings.
2006-12-15 12:19:05 +01:00
46028b0832
wined3d: D3DRS_ZVISIBLE is not supposed to return an error.
2006-12-15 12:18:36 +01:00
2fe8a41cb8
ddraw: Add a TRACE to GetPixelFormat.
2006-12-15 12:18:31 +01:00
398886799e
ddraw: Add IDirectDraw3 interface.
2006-12-14 20:33:49 +01:00
3c5b9557b5
ddraw: Fix IDirectDrawSurfaceImpl_SetColorKey to also change surface_desc.
2006-12-14 20:32:39 +01:00
f0280cbd1e
made functions and variables static in some testcases.
2006-12-11 12:18:29 +01:00
3fd04308ab
d3d: Callback infrastructure for implicit depth stencil surface destruction in IWineD3DDevice.
2006-12-06 12:39:30 +01:00
a60d4b2d2f
d3d: Pass the superior creating object down to the callback functions.
2006-12-04 12:40:38 +01:00
e2881758a1
ddraw: Call wined3d's SetTextureStageState not the one of d3d7.
2006-12-01 12:27:04 +01:00
f8e7ddd798
Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.".
...
This reverts commit 478a414e58
2006-11-30 16:04:00 +01:00
5bec2f57a1
Revert "d3d: Remove AddRef from IWineD3DDevice_GetTexture.".
...
This reverts commit 274df6ef88
2006-11-30 16:04:00 +01:00
274df6ef88
d3d: Remove AddRef from IWineD3DDevice_GetTexture.
2006-11-22 11:40:31 +01:00
Henri Verbeet