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
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
6ba9f27c16
ddraw: Cleanup ddraw7_QueryInterface() a bit.
2013-01-08 12:49:06 +01:00
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
fb37ac56d9
ddraw: Avoid LPDDSURFACEDESC2.
2012-12-07 10:35:36 +01:00
9c3722ec40
ddraw: Remove unused variable.
2012-11-21 13:24:47 +01:00
79f0b4d977
d3d9: Avoid resetting device state for d3d9ex resets.
2012-11-20 11:44:27 +01:00
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
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
ddbe791d37
wined3d: Set texture_level in surface_set_texture_target() as well.
2012-10-24 11:24:22 +02:00
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
bc3d767fda
ddraw: Only restore the display mode if we changed it.
2012-10-17 11:45:14 +02:00
40d3a34004
ddraw: Prevent mode changes when a different ddraw object is in exclusive mode.
2012-10-17 11:45:08 +02:00
1fab14af9e
ddraw: Just implement ddraw7_RestoreDisplayMode() on top of wined3d_set_adapter_display_mode().
2012-10-16 11:37:10 +02:00
4a5ed44d79
ddraw: Get rid of some fallback code in CreateSurface().
2012-10-16 11:36:55 +02:00
8e24dbb60a
wined3d: wined3d_stateblock_apply() never fails.
2012-10-08 11:28:37 +02:00
b69545c7da
wined3d: wined3d_stateblock_capture() never fails.
2012-10-08 11:28:32 +02:00
adddf10cd8
wined3d: wined3d_swapchain_get_desc() never fails.
2012-10-04 14:09:55 +02:00
50c61959eb
wined3d: Just return the surface from wined3d_device_get_surface_from_dc().
2012-10-03 11:19:41 +02:00
95b4207c7f
wined3d: Just return the surface from wined3d_device_get_depth_stencil().
2012-10-01 12:11:02 +02:00
972217fd6a
wined3d: Just return the surface from wined3d_device_get_render_target().
2012-10-01 12:10:55 +02:00
8fd7d3a2b3
wined3d: Just return the swapchain from wined3d_device_get_swapchain().
2012-09-05 11:48:04 +02:00
5b093e6ba9
ddraw: Implement ddraw7_GetMonitorFrequency() on top of wined3d_get_adapter_display_mode().
2012-07-25 11:20:51 +02:00
5f83f2cdf4
ddraw: Implement ddraw7_GetVerticalBlankStatus() on top of wined3d_get_adapter_raster_status().
2012-07-19 15:43:17 +02:00
2bfc5214be
ddraw: Implement ddraw7_GetScanLine() on top of wined3d_get_adapter_raster_status().
2012-07-19 15:43:11 +02:00
89a781adc9
ddraw: Create surfaces with the correct mip level in device_parent_create_texture_surface().
2012-07-16 14:21:46 +02:00
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
46a9a7e548
ddraw: Get rid of the "tex_root" hack.
2012-07-13 10:29:19 -05:00
0821c8024b
wined3d: Merge the device parent create_rendertarget() and create_depth_stencil() handlers.
2012-07-11 09:57:07 -05:00
8ad98cdbee
wined3d: Get rid of the "discard" parameter to device_parent_create_depth_stencil().
2012-07-10 10:39:42 -05:00
9b74ebd794
wined3d: Get rid of the "lockable" parameter to device_parent_create_rendertarget().
2012-07-10 10:39:34 -05:00
73eceafb17
d3d9: Implement d3d9_device_ResetEx().
2012-07-09 15:04:18 -04:00
e97dc9f33d
d3d9: Implement d3d9_EnumAdapterModesEx().
2012-07-02 19:17:59 +02:00
2c8834dffd
d3d9: Implement d3d9_GetAdapterDisplayModeEx().
2012-06-28 01:39:27 +02:00
a1bfd0988f
wined3d: Take scanline ordering into account in the mode setting code.
2012-06-28 01:39:26 +02:00
0f0fe49240
wined3d: Implement mode setting in the adapter instead of the device.
2012-06-22 16:13:58 +02:00
bf876d2a7c
ddraw: Use wined3d_get_adapter_display_mode() in d3d7_EnumZBufferFormats().
2012-06-21 19:52:24 +02:00
a78708ca50
ddraw: Use wined3d_get_adapter_display_mode() in CreateSurface().
2012-06-21 19:52:21 +02:00
11b7604934
ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetScanLine().
2012-06-21 19:52:16 +02:00
0833a639a9
ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes().
2012-06-20 19:27:22 +02:00
e109754b1e
ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode().
2012-06-20 19:27:17 +02:00
bf9b2a89ba
ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain().
2012-06-20 19:27:14 +02:00
2a0463ac21
wined3d: Only filter redundant mode changes in wined3d.
2012-06-20 19:26:56 +02:00
9267148705
wined3d: The wined3d object doesn't need a parent.
2012-05-03 11:18:00 +02:00
fae3a6430d
ddraw: Get rid of IDirect3DVertexBufferImpl.
2012-04-12 20:36:53 +02:00
daedd0077d
ddraw: Get rid of IDirect3DDeviceImpl.
2012-04-10 16:21:25 +02:00
9cb7ca004a
ddraw: Properly retrieve an interface pointer in ddraw7_GetSurfaceFromDC().
2012-04-10 16:21:24 +02:00
5c85f96f33
ddraw: Improve GetScanLine stub so it's usable for timing related tasks.
2012-04-06 20:16:23 +02:00
cf30899f1a
ddraw: Version 1 devices are aggregated by the surface that created them.
2012-04-06 20:11:17 +02:00
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
fefb5a943d
ddraw: Get rid of IDirect3DMaterialImpl.
2012-03-16 11:09:07 +01:00
0c11c316bb
ddraw: Get rid of IDirect3DViewportImpl.
2012-03-15 19:52:05 +01:00
7b918934e6
ddraw: Get rid of IDirect3DLightImpl.
2012-03-14 11:48:45 +01:00
f6bb0a9016
ddraw: Don't return a pointer to the implementation in ddraw7_QueryInterface().
2012-03-14 11:48:26 +01:00
d0a37cdeb5
ddraw: Get rid of IDirectDrawPaletteImpl.
2012-03-13 10:26:54 +01:00
5f43cd2631
ddraw: Get rid of IDirectDrawSurfaceImpl.
2012-03-12 10:44:01 +01:00
1cee1891fd
ddraw: Get rid of IDirectDrawImpl.
2012-03-09 11:32:35 +01:00
ed47f259bd
wined3d: Don't take the wined3d mutex during WM_DISPLAYCHANGE either.
2012-02-21 11:30:10 +01:00
3769afa33d
wined3d: Get rid of the WINED3DSURFTYPE typedef.
2012-01-20 13:31:33 +01:00
ed417a6f13
wined3d: Get rid of the WINED3DSTATEBLOCKTYPE typedef.
2012-01-18 12:37:38 +01:00
e53a277305
wined3d: Get rid of the WINED3DPOOL typedef.
2012-01-18 12:37:38 +01:00
6a5a098b23
wined3d: Get rid of the WINED3DRESOURCETYPE typedef.
2012-01-18 12:37:38 +01:00
992dbc1078
ddraw: Maintain D3D state across cooperative level changes.
2012-01-18 12:37:38 +01:00
a44b062aed
wined3d: Get rid of the WINED3DCUBEMAP_FACES typedef.
2012-01-13 17:34:31 +01:00
daeb4d6d29
ddraw: Make ddraw_reset_enum_callback() and ddraw_surface_destroy() static.
2012-01-09 12:52:11 +01:00
9a8491045e
wined3d: Get rid of the WINED3DMULTISAMPLE_TYPE typedef.
2012-01-09 12:22:17 +01:00
3d33887c2f
wined3d: Get rid of the WINED3DSWAPEFFECT typedef.
2012-01-06 19:24:22 +01:00
387a5f632c
ddraw: Fix the title and class name for the auto ddraw device window.
2011-12-23 13:44:26 +01:00
3e6313050b
ddraw: Handle the special DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW combination.
2011-12-23 13:44:19 +01:00
d8153e5364
ddraw: Properly handle DDSCL_CREATEDEVICEWINDOW.
2011-12-23 13:44:12 +01:00
a5af10e12b
ddraw: Clear the focus and device windows on DDSCL_NORMAL.
2011-12-23 13:44:07 +01:00
2ec0c7bfdc
ddraw: DDSCL_CREATEDEVICEWINDOW requires DDSCL_EXCLUSIVE.
2011-12-23 13:44:00 +01:00
67bca436ee
wined3d: Get rid of the WINED3DDEVTYPE typedef.
2011-12-13 18:58:58 +01:00
ebb85da5f7
wined3d: Get rid of the WINEDDCAPS typedef.
2011-12-13 18:58:58 +01:00
e6fb4537f0
ddraw: Move clipper handling to ddraw.
2011-12-13 18:58:37 +01:00
6523ef5f67
ddraw: Don't enumerate surfaces without references.
2011-12-06 15:50:58 +01:00
94c9b0b4fc
wined3d: Get rid of the WINED3DPRESENT_PARAMETERS typedef.
2011-12-02 11:51:29 +01:00
3430e11605
wined3d: Add a flags parameter to wined3d_surface_create().
2011-11-30 11:50:48 +01:00
82dd612d50
ddraw: Resize the swapchain window on mode changes in exclusive mode.
2011-11-30 11:50:42 +01:00
22d41e2c3f
ddraw: Rename the wineD3D field in IDirectDrawImpl to wined3d.
2011-11-29 13:23:00 +01:00
0f10ac9358
ddraw: Create the wined3d swapchain when setting the cooperative level.
2011-11-29 13:22:54 +01:00
376ffdf3d5
wined3d: Get rid of the WINED3DADAPTER_IDENTIFIER typedef.
2011-11-24 17:10:09 +01:00
bca0ec8182
ddraw: Fail surface creation if the cooperative level isn't set yet.
2011-11-24 17:09:57 +01:00
74345201ad
ddraw: Move setting ddraw->d3d_target out of ddraw_attach_d3d_device().
2011-11-23 09:13:49 +01:00
8e6f5c34a2
ddraw: We can't render to the desktop window either.
2011-11-18 14:26:16 +01:00
18a7653c78
wined3d: Get rid of the WINED3DDISPLAYMODE typedef.
2011-11-17 11:37:26 +01:00
9e0baa55ce
ddraw: Set correct HEL and HAL color models.
2011-11-15 19:37:28 +01:00
a2963b662c
ddraw: Use wined3d_mutex_lock() / wined3d_mutex_unlock() for locking.
2011-11-14 15:25:21 +01:00
d09ad48328
ddraw: Read/draw from/to the actual screen when there is no swapchain window.
2011-10-25 16:57:24 +02:00
14ca56ed97
ddraw: Destroy the swapchain in ddraw_destroy() if it still exists.
2011-10-18 15:10:21 +02:00
472a8f7a67
ddraw: COM cleanup for IDirect3DDevice7 interface.
2011-10-17 18:24:58 +02:00
7dc08745d1
ddraw: Use impl_from_IDirect3DDevice7 for application provided interfaces.
2011-10-17 18:24:42 +02:00
6b7e3e77d0
ddraw: COM cleanup for IDirect3DDevice3 interface.
2011-10-17 18:24:21 +02:00
d32df839ac
ddraw: COM cleanup for IDirect3DDevice2 interface.
2011-10-17 18:23:42 +02:00
496b438ede
wined3d: Remove d3d8/9 palette support.
2011-10-11 13:37:49 +02:00
6253d319cb
ddraw: COM cleanup for IDirect3DViewport3 interface.
2011-10-04 15:25:20 -05:00
a6656468ef
ddraw: COM cleanup for the IDirectDrawPalette interface.
2011-10-04 15:24:44 -05:00
f2044702fa
ddraw: Use the same device name as Windows for the Direct3D HAL device.
2011-10-03 11:25:59 -05:00
4228bbc5bf
ddraw: Store the wined3d swapchain reference in the ddraw object instead of the primary surface.
2011-09-20 16:21:38 +02:00
cc45316d02
ddraw: Setup swapchain dimensions and format using the current display mode in ddraw_create_swapchain().
2011-09-20 16:21:38 +02:00
ec04f80cf6
ddraw: Implement ddraw7_Initialize().
2011-09-19 17:56:05 +02:00
feb96511a9
ddraw: Get rid of IDirectDraw3.
2011-09-19 17:56:05 +02:00
b9fcf71c71
ddraw: Use real flips.
2011-09-16 17:23:08 +02:00
1aeee59bd8
ddraw: Use offscreen backbuffers.
...
In principle this allows us to use more than one backbuffer in ddraw. It's
also a requirement for the next patch.
2011-09-16 17:23:08 +02:00
5186882098
ddraw: Store the primary surface.
2011-09-16 17:23:08 +02:00
f60b54d952
ddraw: Get rid of the surfaces field in IDirectDrawImpl.
2011-09-15 15:41:40 +02:00
5de020342c
ddraw: Get rid of the unused "initialized" field in IDirectDrawImpl.
2011-09-14 09:59:12 +02:00
8173e6f539
ddraw: Just use a static variable for vblank emulation.
2011-09-14 09:58:58 +02:00
60f6c41a67
ddraw: Just use a static variable for scanline emulation.
...
Tracking it per ddraw object doesn't add much.
2011-09-14 09:58:53 +02:00
8973c20f7d
Assorted spelling fixes.
2011-09-13 11:27:01 +02:00
b23809868a
ddraw: Get the total amount of video memory from wined3d.
...
Instead of hoping that what's available at ddraw_init() time is the total.
2011-09-12 10:08:52 +02:00
f3e1a9fa16
ddraw: Initialize the swapchain presentation parameters in ddraw_create_swapchain().
2011-09-12 10:08:38 +02:00
bbfbd66d9f
ddraw: Introduce a function for creating the swapchain.
2011-09-08 11:11:20 +02:00
cbc009b8d2
ddraw: Also check errors returned by ddraw_create_gdi_swapchain() in CreateSurface().
2011-09-08 11:11:15 +02:00
8e79a7e664
ddraw: Add some NULL pointer tests.
2011-09-07 11:15:09 +02:00
5824551d76
ddraw: Set the swap effect to WINED3DSWAPEFFECT_COPY in ddraw_create_gdi_swapchain().
...
The actual swapchain implementation ignores the swap effect and always does a
copy anyway, but this makes it consistent with ddraw_attach_d3d_device().
2011-09-07 11:12:43 +02:00
582767ce45
ddraw: Only explicitly initialize non-zero fields in ddraw_create_gdi_swapchain().
...
Update ddraw_attach_d3d_device() for consistency.
2011-09-07 11:12:34 +02:00
42b7ad4fd4
ddraw: Convert dwZBufferBitDepth into a DDPIXELFORMAT.
2011-08-31 19:43:09 +02:00
c42277883a
ddraw: Introduce a function to convert a DDSURFACEDESC2 to a DDSURFACEDESC.
2011-08-31 19:43:09 +02:00
76fecde8fb
ddraw: Introduce a function to convert a DDSURFACEDESC to a DDSURFACEDESC2.
2011-08-31 19:43:09 +02:00
43ad90ce31
ddraw: Get rid of the ImplType fields in IDirectDrawImpl and IDirectDrawSurfaceImpl.
2011-08-31 19:42:55 +02:00
c89a3ffe80
ddraw: Get rid of the surface implementation switching code.
2011-08-31 19:42:52 +02:00
8f46cb6b8b
ddraw: Introduce a separate function for setting the focus window.
2011-08-29 19:42:46 +02:00
93b5f681d9
ddraw: Remove a redundant check from ddraw7_SetCooperativeLevel().
2011-08-29 19:42:41 +02:00
cad9cbe445
ddraw: Trace which surfaces we enumerate in ddraw7_EnumSurfaces().
2011-08-29 19:42:31 +02:00
899b278558
ddraw: Emulate a 24 bit depth format without stencil or padding.
2011-08-29 13:56:33 +02:00
bf7df85169
ddraw: Do not create implicit depth buffer.
2011-08-25 11:31:38 +02:00
5c8ad26757
ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper.
2011-08-22 17:15:54 +02:00
f932abf326
dlls: Assorted spelling fixes.
2011-08-01 18:26:27 +02:00
2256a7e804
wined3d: wined3d_device_evict_managed_resources() doesn't need a return value.
2011-07-29 12:09:39 +02:00
84413298de
ddraw: Resize the window after setting the new display mode.
2011-07-22 12:57:18 +02:00
04d541c26d
ddraw: Just use SetWindowPos() in ddraw_set_display_mode().
...
Instead of going through wined3d_device_restore_fullscreen_window() /
wined3d_device_setup_fullscreen_window(). The main point of those functions is
changing the window styles, but we don't actually need that here. More
importantly, we filter the messages generated by those functions in wined3d,
while tests show that messages generated by SetDisplayMode() /
RestoreDisplayMode() are visible to the application. Applications depend on
WM_SIZE in particular.
2011-07-19 14:05:56 +02:00
ddc29c40e6
wined3d: Make D3DRS_ZBIAS work.
...
D3DRS_ZBIAS is poorly defined, but it makes sense that the bias should be
format independent. Looking at application behaviour, it seems to include a
slope scale factor as well. This fixes a couple of regressions introduced by
96b758f7b3
2011-07-05 13:46:07 +02:00
5f6d7021aa
ddraw: Separate IDirectDrawSurface and IDirectDrawSurface7 reference counts.
2011-06-28 11:57:50 -05:00
9190d349d2
ddraw: Separate IDirectDrawSurface4 reference count.
2011-06-28 11:57:50 -05:00
c461d312ba
wined3d: Request per-surface palettes in the client libs.
2011-06-24 08:49:48 -05:00
b296f181dd
wined3d: Explicitly set surface alignment in the client libs.
...
Instead of using dxVersion.
2011-06-24 08:49:42 -05:00
8959a1395a
ddraw: Remove ddraw_set_surface_version and set surface version when initialising it.
2011-06-21 17:09:02 +02:00
4c0c0d3aeb
ddraw: Fix ddraw4_EnumSurfaces to pass correct iface in callbacks.
2011-06-20 19:33:30 +02:00
588ddee736
ddraw: COM cleanup for the IDirectDrawClipper iface.
2011-06-20 19:32:03 +02:00
07c761a6a1
ddraw: Implement IDirect3D7::EvictManagedTextures.
2011-06-17 15:37:33 +02:00
d7768739ec
ddraw: COM cleanup for the IDirect3DVertexBuffer7 iface.
2011-06-15 20:04:39 +02:00
60223057f0
ddraw: COM cleanup for the IDirect3DVertexBuffer iface.
2011-06-15 20:04:39 +02:00
ca1ee4a7c3
ddraw: Avoid unsafe IDirect3DVertexBuffer to object casts.
2011-06-15 20:04:39 +02:00
d010dac84d
ddraw: Rename d3d_vertex_buffer_init() and have it allocate the object too.
2011-06-15 20:04:39 +02:00
f3ae1b99f6
ddraw: Separate IDirectDrawSurface vtable.
2011-06-10 15:26:52 +02:00
27063ffeaa
ddraw: Use unsafe_impl_from_IDirectDrawSurface() for application provided interfaces.
2011-06-10 15:26:29 +02:00
0519450708
ddraw: COM cleanup for the IDirect3DLight iface.
2011-06-09 13:28:08 +02:00
d9fb7b9b92
ddraw: COM cleanup for the IDirect3DMaterial3 iface.
2011-06-08 17:43:07 +02:00
8d91f8b614
ddraw: Avoid "unsafe" IDirect3DMaterial3 to object casts.
2011-06-08 17:37:33 +02:00
Henri Verbeet