Commit Graph

1824 Commits

Author SHA1 Message Date
Henri Verbeet 3569b6ccd2 wined3d: wined3d_device_get_viewport() never fails. 2012-09-10 11:40:19 +02:00
Henri Verbeet 64aae8cf02 wined3d: wined3d_device_set_viewport() never fails. 2012-09-10 11:40:14 +02:00
Henri Verbeet a3e28f6ce5 wined3d: wined3d_device_set_index_buffer() never fails. 2012-09-06 15:45:32 +02:00
Henri Verbeet 8fd7d3a2b3 wined3d: Just return the swapchain from wined3d_device_get_swapchain(). 2012-09-05 11:48:04 +02:00
Jacek Caban 4551135f7a ddraw: Use proper helpers for iface calls. 2012-08-27 19:46:03 +02:00
Henri Verbeet 5b093e6ba9 ddraw: Implement ddraw7_GetMonitorFrequency() on top of wined3d_get_adapter_display_mode(). 2012-07-25 11:20:51 +02:00
Henri Verbeet 5f83f2cdf4 ddraw: Implement ddraw7_GetVerticalBlankStatus() on top of wined3d_get_adapter_raster_status(). 2012-07-19 15:43:17 +02:00
Henri Verbeet 2bfc5214be ddraw: Implement ddraw7_GetScanLine() on top of wined3d_get_adapter_raster_status(). 2012-07-19 15:43:11 +02:00
Henri Verbeet 89a781adc9 ddraw: Create surfaces with the correct mip level in device_parent_create_texture_surface(). 2012-07-16 14:21:46 +02:00
Henri Verbeet e5bb2e7d8b ddraw: Create texture surfaces from device_parent_create_texture_surface().
Instead of creating them in advance and hoping we can find them back later.
2012-07-13 10:29:35 -05:00
Henri Verbeet d4fa0d8de2 ddraw: Get rid of some redundant TRACE_ON invocations. 2012-07-13 10:29:25 -05:00
Henri Verbeet 46a9a7e548 ddraw: Get rid of the "tex_root" hack. 2012-07-13 10:29:19 -05:00
Henri Verbeet 0821c8024b wined3d: Merge the device parent create_rendertarget() and create_depth_stencil() handlers. 2012-07-11 09:57:07 -05:00
Henri Verbeet 8ad98cdbee wined3d: Get rid of the "discard" parameter to device_parent_create_depth_stencil(). 2012-07-10 10:39:42 -05:00
Henri Verbeet 9b74ebd794 wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget(). 2012-07-10 10:39:34 -05:00
Henri Verbeet 73eceafb17 d3d9: Implement d3d9_device_ResetEx(). 2012-07-09 15:04:18 -04:00
Henri Verbeet e97dc9f33d d3d9: Implement d3d9_EnumAdapterModesEx(). 2012-07-02 19:17:59 +02:00
Henri Verbeet f95f466060 ddraw: Prevent ddraw from being unloaded. 2012-06-28 18:52:29 +02:00
Henri Verbeet 2c8834dffd d3d9: Implement d3d9_GetAdapterDisplayModeEx(). 2012-06-28 01:39:27 +02:00
Henri Verbeet a1bfd0988f wined3d: Take scanline ordering into account in the mode setting code. 2012-06-28 01:39:26 +02:00
Henri Verbeet 0f0fe49240 wined3d: Implement mode setting in the adapter instead of the device. 2012-06-22 16:13:58 +02:00
Henri Verbeet 220a55c36c ddraw: Use wined3d_get_adapter_display_mode() in d3d_device2_EnumTextureFormats(). 2012-06-21 19:52:33 +02:00
Henri Verbeet 339ef6c252 ddraw: Use wined3d_get_adapter_display_mode() in d3d_device7_EnumTextureFormats(). 2012-06-21 19:52:29 +02:00
Henri Verbeet bf876d2a7c ddraw: Use wined3d_get_adapter_display_mode() in d3d7_EnumZBufferFormats(). 2012-06-21 19:52:24 +02:00
Henri Verbeet a78708ca50 ddraw: Use wined3d_get_adapter_display_mode() in CreateSurface(). 2012-06-21 19:52:21 +02:00
Henri Verbeet 11b7604934 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetScanLine(). 2012-06-21 19:52:16 +02:00
Henri Verbeet 0833a639a9 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes(). 2012-06-20 19:27:22 +02:00
Henri Verbeet e109754b1e ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode(). 2012-06-20 19:27:17 +02:00
Henri Verbeet bf9b2a89ba ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain(). 2012-06-20 19:27:14 +02:00
Henri Verbeet 2a0463ac21 wined3d: Only filter redundant mode changes in wined3d. 2012-06-20 19:26:56 +02:00
Henri Verbeet a6ffab3bf5 wined3d: Rename WINED3DLOCK_* to WINED3D_MAP_*. 2012-06-18 17:48:56 +02:00
Henri Verbeet c722f2d31e ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup(). 2012-06-13 21:35:38 +02:00
Henri Verbeet 34c9586b60 ddraw/tests: Split up test_coop_level_surf_create(). 2012-06-01 17:46:43 +02:00
Henri Verbeet d61d842630 ddraw/tests: Split up test_initialize(). 2012-06-01 17:46:43 +02:00
Henri Verbeet 4f85b3772d ddraw/tests: Add test_coop_level_mode_set() for older ddraw versions. 2012-06-01 17:46:42 +02:00
Henri Verbeet 5227dfa8ef ddraw/tests: Move test_coop_level_mode_set() to ddraw7.c. 2012-05-31 18:05:15 +02:00
Henri Verbeet 643a68f692 ddraw/tests: Add test_redundant_mode_set() for older ddraw versions. 2012-05-30 17:17:59 +02:00
Henri Verbeet 5582e1c9fe ddraw/tests: Move test_redundant_mode_set() to ddraw7.c. 2012-05-30 17:17:59 +02:00
Henri Verbeet 7a52db09e3 ddraw/tests: Add test_window_style() for older ddraw versions. 2012-05-29 10:45:02 +02:00
Henri Verbeet ec8a9df007 ddraw/tests: Move test_window_style() to ddraw7.c. 2012-05-29 10:44:56 +02:00
Henri Verbeet 4bf45eca23 ddraw/tests: Add test_wndproc() for the other ddraw versions as well. 2012-05-24 20:08:49 +02:00
Henri Verbeet ef03ac0005 ddraw/tests: Move test_wndproc() to ddraw7.c. 2012-05-24 20:08:48 +02:00
Henri Verbeet 4905773baf ddraw: Only initially enable color keying for version 1 devices. 2012-05-24 20:08:48 +02:00
Henri Verbeet baa5ceecb0 ddraw/tests: Add a test for the initial color keying state. 2012-05-23 18:24:51 +02:00
Henri Verbeet fa90a256d7 ddraw/tests: Properly cleanup on failed device creation in a couple of places. 2012-05-23 18:24:50 +02:00
Henri Verbeet 89d561e6f8 ddraw/tests: Add a helper function to setup execute buffers. 2012-05-23 18:24:47 +02:00
Henri Verbeet e3ecfa5974 wined3d: Store user clip planes as 4-component float vectors. 2012-05-22 18:07:02 +02:00
Michael Stefaniuc 7fcbf0736e ddraw/tests: Remove some stray ok() calls. 2012-05-21 11:34:38 +02:00
Michael Stefaniuc 3525e1dc46 ddraw/tests: Actually run a test. 2012-05-17 10:18:24 +02:00
Francois Gouget fac36c55e9 Assorted typo, spelling, wording and case fixes. 2012-05-15 16:26:43 +02:00
Henri Verbeet 0f9ccac447 ddraw: Get rid of the member_info typedef. 2012-05-03 23:44:53 +02:00
Henri Verbeet 9267148705 wined3d: The wined3d object doesn't need a parent. 2012-05-03 11:18:00 +02:00
Henri Verbeet 5b680d6023 ddraw: Get rid of the flag_info typedef. 2012-05-03 11:17:56 +02:00
Henri Verbeet 9fd2d34d68 ddraw: Get rid of IClassFactoryImpl. 2012-04-26 19:26:11 +02:00
Henri Verbeet e744bf78c8 ddraw/tests: Add a helper function to set the viewport background material. 2012-04-20 11:58:00 +02:00
Henri Verbeet 3f0af44ffb ddraw/tests: Add a helper function to create a material. 2012-04-16 12:05:21 +02:00
Henri Verbeet 8cef8b3587 wined3d: Unify the wined3d_mapped_rect and wined3d_mapped_box structures. 2012-04-13 10:48:51 +02:00
Henri Verbeet fae3a6430d ddraw: Get rid of IDirect3DVertexBufferImpl. 2012-04-12 20:36:53 +02:00
Henri Verbeet 4d1a659c3a ddraw: Get rid of IDirect3DExecuteBufferImpl. 2012-04-11 18:14:41 +02:00
Henri Verbeet daedd0077d ddraw: Get rid of IDirect3DDeviceImpl. 2012-04-10 16:21:25 +02:00
Henri Verbeet 96fa113513 ddraw: Properly retrieve an interface pointer in IDirect3DDeviceImpl_7_GetTexture(). 2012-04-10 16:21:25 +02:00
Henri Verbeet 9cb7ca004a ddraw: Properly retrieve an interface pointer in ddraw7_GetSurfaceFromDC(). 2012-04-10 16:21:24 +02:00
Henri Verbeet 9d317e632f ddraw: Properly retrieve an interface pointer in ddraw_surface7_GetPalette(). 2012-04-09 12:02:55 +02:00
Henri Verbeet 02b9988f48 ddraw: Simplify updating palette entries in d3d_texture2_Load(). 2012-04-09 12:02:51 +02:00
Piotr Caban 5c85f96f33 ddraw: Improve GetScanLine stub so it's usable for timing related tasks. 2012-04-06 20:16:23 +02:00
Henri Verbeet 9804ebcd9e ddraw/tests: Add some QueryInterface() tests for devices. 2012-04-06 20:11:23 +02:00
Henri Verbeet cf30899f1a ddraw: Version 1 devices are aggregated by the surface that created them. 2012-04-06 20:11:17 +02:00
Henri Verbeet e13de0adf8 ddraw: Fix querying device interfaces in IDirect3DDeviceImpl_7_QueryInterface().
Version 7 devices can only return the version 7 interface. The other versions
can only return earlier interfaces.
2012-04-06 20:11:13 +02:00
Henri Verbeet 1a98c339ca ddraw: Remove some interfaces from IDirect3DDeviceImpl_7_QueryInterface(). 2012-04-04 17:22:30 +02:00
Henri Verbeet cd8508a915 ddraw: Replace an ERR in IDirect3DDeviceImpl_7_QueryInterface() with a WARN. 2012-04-04 17:22:23 +02:00
Henri Verbeet 4f91eb3fe1 ddraw: Keep track of the ddraw version used to create a device.
This also obsoletes the "from_surface" device field.
2012-04-04 17:22:19 +02:00
Henri Verbeet cdd2d7f258 ddraw/tests: Add some QueryInterface() tests for surfaces. 2012-04-03 12:00:41 +02:00
Henri Verbeet ecd1c78c48 ddraw: Surface versions before 7 return E_INVALIDARG on failure in QueryInterface(). 2012-04-03 12:00:13 +02:00
Henri Verbeet 75aa0b38f7 ddraw: The various D3D device interfaces can't be queried from version 7 surfaces. 2012-04-03 12:00:10 +02:00
Henri Verbeet 814fd3b39e ddraw: The texture interface shares its refcount with the surface interface version used to create the surface.
This probably implies that on native the texture interface is part of a
separate object that's aggregated by the surface.
2012-04-02 12:39:28 +02:00
Henri Verbeet 7dd4f439e3 ddraw: The texture interfaces can't be queried from version 7 surfaces. 2012-04-02 12:39:22 +02:00
Henri Verbeet 8481625fa4 ddraw: Explicitly check for the IDirectDrawColorControl interface in ddraw_surface7_QueryInterface(). 2012-04-02 12:39:19 +02:00
Henri Verbeet f7719a89ad ddraw: Querying IUnknown for a surface should return the IDirectDrawSurface interface. 2012-03-30 10:43:49 +02:00
Henri Verbeet a623075612 ddraw: Replace a ERR in ddraw_surface7_QueryInterface() with a WARN. 2012-03-30 10:43:44 +02:00
Henri Verbeet f3d1d4790c ddraw: Get rid of a couple of redundant else-statements. 2012-03-30 10:43:33 +02:00
Henri Verbeet 02b6e04a76 ddraw/tests: Add a helper function to create a viewport. 2012-03-27 11:38:41 +02:00
Henri Verbeet 6f35ec6092 ddraw: Make ddraw_surface_wined3d_parent_ops static. 2012-03-26 18:15:07 +02:00
Henri Verbeet fefb5a943d ddraw: Get rid of IDirect3DMaterialImpl. 2012-03-16 11:09:07 +01:00
Henri Verbeet 0c11c316bb ddraw: Get rid of IDirect3DViewportImpl. 2012-03-15 19:52:05 +01:00
Henri Verbeet 7b918934e6 ddraw: Get rid of IDirect3DLightImpl. 2012-03-14 11:48:45 +01:00
Henri Verbeet 2071026acd ddraw: Don't return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface(). 2012-03-14 11:48:41 +01:00
Henri Verbeet d92a103fc0 ddraw: Don't return a pointer to the implementation in IDirect3DMaterialImpl_QueryInterface(). 2012-03-14 11:48:37 +01:00
Henri Verbeet 9157006fc1 ddraw: Don't return a pointer to the implementation in IDirect3DDeviceImpl_7_QueryInterface(). 2012-03-14 11:48:32 +01:00
Henri Verbeet f6bb0a9016 ddraw: Don't return a pointer to the implementation in ddraw7_QueryInterface(). 2012-03-14 11:48:26 +01:00
André Hentschel b9c1e5ad32 ddraw: Fix a typo. 2012-03-13 10:38:17 +01:00
Henri Verbeet d0a37cdeb5 ddraw: Get rid of IDirectDrawPaletteImpl. 2012-03-13 10:26:54 +01:00
Henri Verbeet 9e44c4bc58 ddraw/tests: Fix a couple of return value checks. 2012-03-13 10:26:49 +01:00
Henri Verbeet 5f43cd2631 ddraw: Get rid of IDirectDrawSurfaceImpl. 2012-03-12 10:44:01 +01:00
Henri Verbeet 1cee1891fd ddraw: Get rid of IDirectDrawImpl. 2012-03-09 11:32:35 +01:00
Henri Verbeet 4c8ee13d5b ddraw: Trace color keys in hex. 2012-03-08 17:58:08 +01:00
Henri Verbeet 3c5a2549c5 ddraw/tests: Add tests for color keyed texturing with an alpha channel. 2012-02-29 10:31:20 +01:00
Stefan Dösinger f8d6d0300b ddraw/tests: LONG/ULONG and error checking fixes. 2012-02-27 14:15:31 +01:00
Francois Gouget cdac8cb176 ddraw/tests: Fix compilation on systems that don't support nameless unions. 2012-02-27 12:54:14 +01:00
Henri Verbeet 19199bc524 ddraw/tests: Add tests for z-clipping with D3DRENDERSTATE_ZENABLE disabled. 2012-02-24 09:55:56 +01:00
Henri Verbeet f20e07b77b ddraw: Always pin surfaces. 2012-02-22 11:26:32 +01:00
Henri Verbeet ed47f259bd wined3d: Don't take the wined3d mutex during WM_DISPLAYCHANGE either. 2012-02-21 11:30:10 +01:00
Matteo Bruni 769fd080f8 ddraw: Don't leak the window DC. 2012-02-08 17:20:22 -06:00
Francois Gouget 527e1ae1ac ddraw/tests: Fix compilation on systems that don't support nameless unions. 2012-02-06 10:19:53 -06:00
Henri Verbeet 204e53e449 ddraw: Implement get_window_region() on top of GetRandomRgn().
Instead of just GetClientRect(). This fixes a regression introduced by
3e9fe3e938. We also need to clip against e.g.
the screen edges instead of just the client rect.
2012-02-06 10:19:31 -06:00
Henri Verbeet 7fda67d74a ddraw/tests: Move some helper functions up with the rest of the helper functions. 2012-02-05 09:36:11 -06:00
Henri Verbeet 98bd3ef803 ddraw/tests: Use correct COM macros in a couple of places. 2012-02-05 09:34:05 -06:00
Stefan Dösinger acf82ff1f5 ddraw/tests: Add some IDirect3DViewport interface tests. 2012-02-02 12:59:36 +01:00
Stefan Dösinger 4775c76208 ddraw/tests: Add an IDirect3DDevice7::Load color key test. 2012-01-31 17:49:27 +01:00
Stefan Dösinger cfc9e120ae ddraw/tests: Add an IDirect3DTexture2::Load color key test. 2012-01-31 17:49:23 +01:00
Stefan Dösinger 2bd56ac553 ddraw/tests: Add an IDirect3DTexture::Load color key test. 2012-01-31 17:49:19 +01:00
Stefan Dösinger 551c732d74 ddraw: Properly set the color key in texture::load. 2012-01-31 17:49:15 +01:00
Henri Verbeet 0d8e6719d5 ddraw: AddAttachedSurface() just references whatever we pass it. 2012-01-31 13:46:30 +01:00
Stefan Dösinger 60ef7e0bd4 ddraw/tests: Port the depth blit test to ddraw2. 2012-01-30 20:44:47 +01:00
Stefan Dösinger b16248898b ddraw/tests: Port the depth blit test to ddraw4. 2012-01-30 20:44:47 +01:00
Stefan Dösinger 8a82f0083a ddraw/tests: Port the depth blit test to ddraw7. 2012-01-30 20:44:46 +01:00
Henri Verbeet ed6461f9da ddraw/tests: Add a test for SetCooperativeLevel() on a window that belongs to another thread. 2012-01-27 14:57:55 +01:00
Alexandre Julliard 5f42f7d4fa ddraw: AddRef the correct interface pointer in AddAttachedSurface. 2012-01-25 21:38:32 +01:00
Matteo Bruni e51d3f6de6 ddraw: Accept pointers to wrong IDirectDrawSurface versions. 2012-01-24 11:56:06 +01:00
Francois Gouget 21036e13df ddraw/tests: Fix compilation on systems that don't support nameless unions. 2012-01-23 16:06:54 +01:00
Henri Verbeet 3769afa33d wined3d: Get rid of the WINED3DSURFTYPE typedef. 2012-01-20 13:31:33 +01:00
Henri Verbeet 67d4be0347 ddraw: Just pin all version 1 surfaces. 2012-01-19 11:56:35 +01:00
Henri Verbeet ed417a6f13 wined3d: Get rid of the WINED3DSTATEBLOCKTYPE typedef. 2012-01-18 12:37:38 +01:00
Henri Verbeet e53a277305 wined3d: Get rid of the WINED3DPOOL typedef. 2012-01-18 12:37:38 +01:00
Henri Verbeet 6a5a098b23 wined3d: Get rid of the WINED3DRESOURCETYPE typedef. 2012-01-18 12:37:38 +01:00
Henri Verbeet 992dbc1078 ddraw: Maintain D3D state across cooperative level changes. 2012-01-18 12:37:38 +01:00
Henri Verbeet dfa7e9b563 ddraw/tests: Add some tests to show that we should maintain D3D state across cooperative level chnages. 2012-01-18 12:37:38 +01:00
Henri Verbeet 1acd8278c8 ddraw/tests: Add a border around the blitted source data in test_clipper_blt().
Some drivers use the neighbouring pixels in the interpolation. You can
probably argue about whether that's right or wrong, but it's really not what
we're trying to test in either case.
2012-01-18 12:37:38 +01:00
Henri Verbeet cf636cc3b3 ddraw: Allow querying the surface interface if a device was created from a surface. 2012-01-18 12:37:38 +01:00
Henri Verbeet e70990041b wined3d: Get rid of the WINED3DTEXTUREFILTERTYPE typedef. 2012-01-13 17:34:31 +01:00
Henri Verbeet a44b062aed wined3d: Get rid of the WINED3DCUBEMAP_FACES typedef. 2012-01-13 17:34:31 +01:00
Henri Verbeet afb64506ba ddraw: Implement width and height changes in ddraw_surface7_SetSurfaceDesc(). 2012-01-13 17:34:30 +01:00
Henri Verbeet f38e94af7c wined3d: Get rid of the WINED3DTRANSFORMSTATETYPE typedef. 2012-01-12 12:37:18 +01:00
Henri Verbeet d6dfb7914a ddraw/tests: Fix some surface locking calls.
In ddraw7 DDLOCK_WAIT is the default behaviour, in earlier versions it's
DDLOCK_DONOTWAIT.
2012-01-12 12:37:09 +01:00
Henri Verbeet b6431d9493 wined3d: Get rid of the WINED3DTEXTUREOP typedef. 2012-01-11 17:47:22 +01:00
Henri Verbeet 43fcbcb36e wined3d: Get rid of the WINED3DTEXTURESTAGESTATETYPE typedef. 2012-01-10 10:47:27 +01:00
Henri Verbeet 1ef86ad596 ddraw: Properly clear the clip list if ddraw_clipper_SetClipList() is called with NULL region data. 2012-01-10 10:47:13 +01:00
Henri Verbeet e2765579bc ddraw/tests: Add tests for clippers with a destroyed window. 2012-01-10 10:47:04 +01:00
Francois Gouget daeb4d6d29 ddraw: Make ddraw_reset_enum_callback() and ddraw_surface_destroy() static. 2012-01-09 12:52:11 +01:00
Francois Gouget adcd8637ac ddraw/tests: Fix compilation on systems that don't support nameless unions. 2012-01-09 12:52:10 +01:00
Henri Verbeet 9a8491045e wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef. 2012-01-09 12:22:17 +01:00
Henri Verbeet 08545dc739 wined3d: Get rid of the WINED3DSAMPLERSTATETYPE typedef. 2012-01-09 12:22:12 +01:00
Henri Verbeet 01992d7fb5 ddraw: Don't leak the window region if we have an extra clip rect in ddraw_clipper_GetClipList(). 2012-01-09 12:21:59 +01:00
Henri Verbeet 3d33887c2f wined3d: Get rid of the WINED3DSWAPEFFECT typedef. 2012-01-06 19:24:22 +01:00
Henri Verbeet 31f3120815 ddraw: Convert to integer before adjusting the clipped source rect.
This makes a difference for the bottom and right edges, and we could end up
with an empty source rectangle otherwise.
2012-01-06 19:24:20 +01:00
Henri Verbeet f17e714857 ddraw: Implement IDirectDrawClipper::SetClipList(). 2012-01-06 19:24:20 +01:00
Henri Verbeet 3e9fe3e938 ddraw: Use the window's client rect for clipping. 2012-01-06 19:24:19 +01:00
Henri Verbeet 223b0736c0 ddraw: Disallow clipped blits in ddraw_surface7_BltFast(). 2012-01-05 20:54:21 +01:00
Henri Verbeet 99e5e3ac0d ddraw: Refuse to set a clip list if a clipper is already tracking a window. 2012-01-05 20:54:19 +01:00
Henri Verbeet 3997457574 ddraw/tests: Add some clipper tests. 2012-01-05 20:54:17 +01:00
André Hentschel b5ba054ce8 Assorted header comment cleanup. 2012-01-04 19:35:13 +01:00