Henri Verbeet
1bb17316ff
ddraw: Avoid LPD3DBRANCH.
2013-01-16 12:22:37 +01:00
Henri Verbeet
1ed6a0842d
ddraw: Avoid LPD3DTRIANGLE.
2013-01-16 12:22:35 +01:00
Henri Verbeet
a7f4ac283b
ddraw: Get rid of the local "window" variable in ddraw7_SetCooperativeLevel().
...
Having both a "hwnd" and a "window" here doesn't exactly make things much
easier to follow.
2013-01-15 12:13:08 +01:00
Henri Verbeet
292522c4ad
ddraw: Only modify the ddraw destination window at the end of ddraw7_SetCooperativeLevel().
...
We want this to happen after ddraw_destroy_swapchain() in particular, because
dest_window being different from d3d_window will cause it to destroy
d3d_window, but this seems like a good idea in general.
2013-01-15 12:13:04 +01:00
Henri Verbeet
ae725df54a
ddraw: Add a small tests for SetCooperativeLevel() calls with different windows.
...
In particular, test that the windows aren't destroyed by accident.
2013-01-15 12:12:56 +01:00
Henri Verbeet
b43f897675
ddraw: Avoid LPD3DPROCESSVERTICES.
2013-01-15 12:12:48 +01:00
Henri Verbeet
61e8f02ce2
ddraw: Avoid LPD3DSTATE.
2013-01-15 12:12:45 +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
Henri Verbeet
af377acabe
ddraw: Get rid of dump_light().
2013-01-14 11:01:46 +01:00
Henri Verbeet
d9051bbe93
ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight().
2013-01-14 11:01:42 +01:00
Henri Verbeet
cc60cc6abb
ddraw: Avoid LPD3DINSTRUCTION.
2013-01-14 11:01:34 +01:00
Henri Verbeet
e8f9704462
ddraw: Avoid LPD3DLIGHT2.
2013-01-11 18:14:06 +01:00
Stefan Dösinger
d3520ef465
ddraw: Don't discard buffers that haven't been used in draws.
2013-01-10 16:05:34 +01:00
Andrew Talbot
1e31182c0b
ddraw: Avoid signed-unsigned integer comparisons.
2013-01-10 12:23:13 +01:00
Henri Verbeet
6ba9f27c16
ddraw: Cleanup ddraw7_QueryInterface() a bit.
2013-01-08 12:49:06 +01:00
Henri Verbeet
da817d8e91
ddraw: Get rid of some redundant code in IDirect3DImpl_GetCaps().
...
dwTextureBlendCaps is overwritten later, and (potentially) uninitialized here.
2013-01-07 11:12:28 +01:00
Henri Verbeet
293f362d55
ddraw: Avoid LPD3DMATRIX.
2013-01-04 12:16:27 +01:00
Stefan Dösinger
3b197749f9
ddraw: Align user vertex data.
2012-12-18 12:37:00 +01:00
Stefan Dösinger
09d44a1967
ddraw: Handle DrawIndexedPrimitive via dynamic buffers.
2012-12-18 12:36:54 +01:00
Stefan Dösinger
94388ed6c2
ddraw: Handle DrawPrimitive with a dynamic vertex buffer.
2012-12-18 12:36:47 +01:00
Stefan Dösinger
6deaa02fda
ddraw: Move the index buffer growing code to a separate function.
2012-12-18 12:36:40 +01:00
Stefan Dösinger
ea40a3a8b5
ddraw: Pass the number of vertices to DrawIndexedPrimitive.
2012-12-18 12:36:28 +01:00
Henri Verbeet
99dcfdf0ce
ddraw: Avoid LPD3DDEVICEDESC7.
2012-12-12 11:58:55 +01:00
Henri Verbeet
fb37ac56d9
ddraw: Avoid LPDDSURFACEDESC2.
2012-12-07 10:35:36 +01:00
Henri Verbeet
b1186d71c2
ddraw: Avoid LPDDSURFACEDESC.
2012-12-07 10:35:29 +01:00
Stefan Dösinger
67230fc013
ddraw: Create a dynamic buffer if DDLOCK_DISCARDCONTENTS is used.
2012-12-04 10:55:06 +01:00
Stefan Dösinger
21e2ceb4c1
ddraw: Don't map 1, 2 and 4 bit alpha formats to WINED3DFMT_A8_UNORM.
2012-12-03 12:37:06 +01:00
Stefan Dösinger
a61f68fc5a
ddraw: Properly use the index buffer as a dynamic buffer.
2012-11-28 20:14:58 +01:00
Stefan Dösinger
108fcb691c
ddraw: Make the index buffer write only.
2012-11-28 20:14:58 +01:00
Stefan Dösinger
4b95487bdd
ddraw: Don't create a wastefully large index buffer.
2012-11-28 20:14:57 +01:00
Frédéric Delanoy
80d3010099
ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity).
2012-11-26 11:49:47 +01:00
Andrew Talbot
9c3722ec40
ddraw: Remove unused variable.
2012-11-21 13:24:47 +01:00
Henri Verbeet
79f0b4d977
d3d9: Avoid resetting device state for d3d9ex resets.
2012-11-20 11:44:27 +01:00
Henri Verbeet
0fa127b1fa
ddraw: Avoid LPDIRECT3D7.
2012-11-16 11:39:42 +01:00
Henri Verbeet
a24d59a1dd
ddraw: Avoid LPDIRECT3DDEVICE7.
2012-11-14 11:27:30 +01:00
Henri Verbeet
ea50cde939
ddraw: Avoid LPDIRECT3DVIEWPORT2.
2012-11-13 16:54:53 +01:00
Henri Verbeet
98dc4cd43c
ddraw: Avoid LPDIRECT3DVERTEXBUFFER7.
2012-11-08 15:37:46 +01:00
Henri Verbeet
99daff8f03
ddraw: Avoid LPDIRECTDRAW.
2012-11-08 15:37:46 +01:00
Henri Verbeet
8fd29034d0
ddraw/tests: Avoid LPDIRECTDRAW7.
2012-11-07 11:57:13 +01:00
Henri Verbeet
2889ec6bb0
ddraw: Avoid LPDIRECTDRAWSURFACE.
2012-11-06 16:02:33 +01:00
Henri Verbeet
b146861c36
ddraw: Avoid LPDIRECTDRAWSURFACE2.
2012-11-06 16:02:32 +01:00
Henri Verbeet
5190792b33
ddraw: Avoid LPDIRECTDRAWSURFACE4.
2012-11-05 11:30:31 +01:00
Henri Verbeet
1216eb577b
ddraw: Avoid LPDIRECTDRAWSURFACE7.
2012-11-05 11:30:31 +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
191db92fd5
ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface().
2012-10-25 11:48:19 +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
f9105db050
ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects.
2012-10-17 11:54:57 +02:00
Henri Verbeet
698ff9ba4e
ddraw: When restoring the display mode, use the mode set before the first mode change on any ddraw object.
2012-10-17 11:45:20 +02:00
Henri Verbeet
bc3d767fda
ddraw: Only restore the display mode if we changed it.
2012-10-17 11:45:14 +02:00
Henri Verbeet
40d3a34004
ddraw: Prevent mode changes when a different ddraw object is in exclusive mode.
2012-10-17 11:45:08 +02:00
Henri Verbeet
1fab14af9e
ddraw: Just implement ddraw7_RestoreDisplayMode() on top of wined3d_set_adapter_display_mode().
2012-10-16 11:37:10 +02:00
Henri Verbeet
4a5ed44d79
ddraw: Get rid of some fallback code in CreateSurface().
2012-10-16 11:36:55 +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
50c61959eb
wined3d: Just return the surface from wined3d_device_get_surface_from_dc().
2012-10-03 11:19:41 +02:00
Henri Verbeet
82282db65e
ddraw: Properly release the ddraw reference when the last interface is released in ddraw_surface_release_iface().
2012-10-01 12:11:09 +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
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
01918d05ed
wined3d: wined3d_device_set_vertex_declaration() never fails.
2012-09-21 10:53:06 +02:00
Henri Verbeet
62670c7ba5
wined3d: wined3d_device_get_sampler_state() never fails.
2012-09-19 13:04:52 +02:00
Henri Verbeet
0d96be2c20
wined3d: wined3d_device_set_sampler_state() never fails.
2012-09-19 13:04:48 +02:00
Erich Hoover
b0cefe897c
ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx.
2012-09-18 18:02:41 +02:00
Erich Hoover
83b02573cc
ddraw: Convert calls to DirectDrawEnumerate into DirectDrawEnumerateEx.
2012-09-18 18:01:52 +02:00
Henri Verbeet
343974e2fd
wined3d: wined3d_device_get_material() never fails.
2012-09-18 10:18:51 +02:00
Henri Verbeet
2669feeb8c
wined3d: wined3d_device_set_material() never fails.
2012-09-18 10:18:42 +02:00
Alexandre Julliard
8ab2ed64fd
ddraw/tests: Fix clip region tests for older ddraw too.
2012-09-17 12:10:55 +02:00
Henri Verbeet
90bd04c6b6
wined3d: wined3d_device_multiply_transform() never fails.
2012-09-14 15:43:20 +02:00
Alexandre Julliard
83cfd54f85
ddraw/tests: Allow the clip region to contain multiple rectangles.
2012-09-13 23:35:49 +02:00
Henri Verbeet
706ece827b
wined3d: wined3d_device_get_transform() never fails.
2012-09-12 12:46:12 +02:00
Henri Verbeet
f79bbc767d
wined3d: wined3d_device_set_transform() never fails.
2012-09-12 12:46:07 +02:00
Henri Verbeet
d601a0dede
wined3d: wined3d_device_get_render_state() never fails.
2012-09-11 18:03:57 +02:00
Henri Verbeet
75cec973d5
wined3d: wined3d_device_set_render_state() never fails.
2012-09-11 18:03:53 +02:00
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