Commit Graph

787 Commits

Author SHA1 Message Date
Stefan Dösinger 67b1f4a7e9 wined3d: BeginScene and EndScene tests and fixes. 2007-02-12 12:08:34 +01:00
H. Verbeet 6112522122 wined3d: Move SetupFullscreenWindow() and RestoreWindow() from IDirectDrawImpl to IWineD3DDeviceImpl. 2007-01-19 12:28:58 +01:00
Francois Gouget d4ca34dd9b d3d: Fix the D3DFMT_XXX constant declarations. 2007-01-18 12:05:05 +01:00
Stefan Dösinger 1d3abdeeaa wined3d: Store the stream number in the strided structure. 2007-01-17 11:23:54 +01:00
Stefan Dösinger 3d14118fb7 ddraw: Get some texture stage states from their equivalent sampler states. 2007-01-10 22:01:31 +01:00
Michael Stefaniuc 33af3c5c83 janitorial: Use the C standard for multiline strings. 2007-01-10 12:28:19 +01:00
Stefan Dösinger 4e8e47fc6c ddraw: Forward the DDSCAPS2_TEXTUREMANAGE flag to wined3d. 2007-01-08 20:59:29 +01:00
Stefan Dösinger 3581d8e8d8 wined3d: Do not keep internal references on vertex buffers. 2007-01-08 20:59:06 +01:00
Andrew Talbot 386fdd81e9 ddraw: Declare some functions static. 2007-01-04 21:14:08 +01:00
Andrew Talbot 7c95df77ae ddraw: Declare some functions static. 2007-01-04 09:55:15 +01:00
Stefan Dösinger 71631f7638 wined3d: Use the baseVertexIndex in the stateblock. 2007-01-03 11:02:51 +01:00
Christoph Bumiller b1cc8bec82 ddraw: Fix the AddViewport thunk. 2007-01-03 11:01:12 +01:00
Alexandre Julliard 656fc93815 Use GetDC instead of CreateDC where possible. 2007-01-02 17:16:36 +01:00
Michael Stefaniuc c7e00c9f49 janitorial: In multiline strings there is no need for '\' at the end of the lines. 2006-12-27 13:10:13 +01:00
Günther Brammer 8485eb02dc ddraw: Add a test for IDirectDrawSurface_SetColorKey. 2006-12-21 11:25:05 +01:00
Markus Amsler 5e0fc62135 d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice. 2006-12-18 12:07:26 +01:00
Ulrich Czekalla 325f666fc5 ddraw: IDirectDraw3 should use its own ref count variable. 2006-12-16 17:01:52 +01:00
Ulrich Czekalla f26cb44c73 ddraw: Initialize the IDirectDraw3 vtable. 2006-12-16 17:01:46 +01:00
Vitaliy Margolen 2a63a03eb1 wined3d: When changing display modes clip cursor to the requested display size. 2006-12-15 13:44:36 +01:00
Dmitry Timoshkov 8836dea139 ddraw: Fix warnings. 2006-12-15 12:19:05 +01:00
Stefan Dösinger 46028b0832 wined3d: D3DRS_ZVISIBLE is not supposed to return an error. 2006-12-15 12:18:36 +01:00
Stefan Dösinger 2fe8a41cb8 ddraw: Add a TRACE to GetPixelFormat. 2006-12-15 12:18:31 +01:00
Ulrich Czekalla 398886799e ddraw: Add IDirectDraw3 interface. 2006-12-14 20:33:49 +01:00
Günther Brammer 3c5b9557b5 ddraw: Fix IDirectDrawSurfaceImpl_SetColorKey to also change surface_desc. 2006-12-14 20:32:39 +01:00
Marcus Meissner f0280cbd1e made functions and variables static in some testcases. 2006-12-11 12:18:29 +01:00
Markus Amsler 3fd04308ab d3d: Callback infrastructure for implicit depth stencil surface destruction in IWineD3DDevice. 2006-12-06 12:39:30 +01:00
Markus Amsler a60d4b2d2f d3d: Pass the superior creating object down to the callback functions. 2006-12-04 12:40:38 +01:00
Markus Amsler e2881758a1 ddraw: Call wined3d's SetTextureStageState not the one of d3d7. 2006-12-01 12:27:04 +01:00
Markus Amsler f8e7ddd798 Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.".
This reverts commit 478a414e58.
2006-11-30 16:04:00 +01:00
Markus Amsler 5bec2f57a1 Revert "d3d: Remove AddRef from IWineD3DDevice_GetTexture.".
This reverts commit 274df6ef88.
2006-11-30 16:04:00 +01:00
Markus Amsler 274df6ef88 d3d: Remove AddRef from IWineD3DDevice_GetTexture. 2006-11-22 11:40:31 +01:00
Markus Amsler 478a414e58 d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer. 2006-11-22 11:39:52 +01:00
Francois Gouget 30e44c85c8 Assorted spelling fixes. 2006-11-07 15:25:24 +01:00
Andrey Turkin 3bc442dc8c ddraw: Add missing dereference operators. 2006-10-26 13:04:52 +02:00
Stefan Dösinger 9329efa88e ddraw: Forward the depth stencil buffer to wined3d. 2006-10-25 20:20:59 +02:00
Ivan Gyurdiev 4f611bc0e0 wined3d: Add D3DTA masks to the WINED3D namespace.
Also fix usage of D3DTSS/D3DTA in ddraw.
2006-10-24 20:06:30 +02:00
Stefan Dösinger 116236f18c ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTURE[MIN/MAG]. 2006-10-16 17:05:36 +02:00
Stefan Dösinger 1d65ade5fa ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREADDRESS[U/V]. 2006-10-16 17:05:31 +02:00
Stefan Dösinger e92d7cbf2b ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREHANDLE. 2006-10-16 12:12:58 +02:00
Stefan Dösinger 1c86290bd5 ddraw: Use real handles for state blocks. 2006-10-16 12:07:30 +02:00
Stefan Dösinger 2e5628df3f ddraw: Make the surface list a standard wine list. 2006-10-16 12:06:43 +02:00
Ivan Gyurdiev c912032aa5 wined3d: Add D3DTEXTUREOP to the WINED3D namespace. 2006-10-13 11:13:02 +02:00
Stefan Dösinger 75c67f6b45 ddraw: Do not let the a surface dimension fall to 0. 2006-10-13 11:06:28 +02:00
Stefan Dösinger b4afa19272 ddraw: Remove an incorrect size check. 2006-10-13 11:06:15 +02:00
Ivan Gyurdiev 9628a1b2e2 wined3d: Merge D3DRECT types into one type in WINED3D namespace. 2006-10-12 12:37:08 +02:00
Ivan Gyurdiev ac37163124 wined3d: Merge D3DMATRIX types into one type in WINED3D namespace. 2006-10-12 12:35:00 +02:00
Ivan Gyurdiev ec782c2b97 wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace. 2006-10-12 12:33:39 +02:00
Ivan Gyurdiev b1a4bd87a9 wined3d: D3DRENDERSTATETYPE: Consistently use in the WINED3D namespace. 2006-10-12 12:33:24 +02:00
Ivan Gyurdiev 732e0e908b wined3d: Merge GAMMARAMP types into one type in WINED3D namespace. 2006-10-11 12:22:01 +02:00
Ivan Gyurdiev 5f2987ae32 wined3d: Merge VIEWPORT types into one type in WINED3D namespace. 2006-10-11 12:21:54 +02:00
Ivan Gyurdiev 90f5be2bef wined3d: Merge MATERIAL types into one type in WINED3D namespace. 2006-10-11 12:21:14 +02:00
Ivan Gyurdiev 70bbf734b1 wined3d: Merge LIGHT types into one type in WINED3D namespace. 2006-10-11 12:21:06 +02:00
H. Verbeet 2465fcb368 ddraw: Win64 printf format warning fixes. 2006-10-11 12:08:28 +02:00
H. Verbeet 37cb9de851 ddraw/tests: Win64 printf format warning fixes. 2006-10-10 19:59:14 +02:00
Jesse Allen 52296dbdbf ddraw: Fix for DDSURFACEDESC param in CreateSurface. 2006-10-10 19:33:15 +02:00
Stefan Dösinger 4ff712c938 ddraw: Remove the process counter. 2006-10-09 20:38:37 +02:00
Stefan Dösinger 3543a070ff ddraw: Protect the ddraw list. 2006-10-09 20:38:27 +02:00
Stefan Dösinger 09e794aff8 ddraw: Make the ddraw list a wine list. 2006-10-09 20:38:15 +02:00
Stefan Dösinger 48b550c9db ddraw: Set the DDSCAPS2_MIPMAPSUBLEVEL flag on sublevels. 2006-10-09 12:54:38 +02:00
James Hawkins 1a922b6a38 ddraw: Set lplpDirect3DViewport3 to NULL before returning an error (found by Smatch). 2006-10-06 15:20:46 +02:00
Stefan Dösinger 3529560cd7 wined3d: Add WINED3DUSAGE_OVERLAY. 2006-10-06 12:53:24 +02:00
Stefan Dösinger 2bcacf22d3 wined3d: Add IWineD3DSurface::UpdateOverlay. 2006-10-06 12:53:24 +02:00
Stefan Dösinger 080e4f56cf wined3d: Add UpdatOverlayZOrder. 2006-10-06 12:53:24 +02:00
Stefan Dösinger f6647486cf wined3d: Add IWineD3DSurface::GetOverlayPosition. 2006-10-06 12:53:24 +02:00
Stefan Dösinger 0f3995d21a wined3d: Add IWineD3DSurface::SetOverlayPosition. 2006-10-06 12:53:24 +02:00
Francois Gouget 82babbee0b Add missing '\n's to Wine traces. 2006-10-05 17:46:48 +02:00
Elie Morisse f9593bfe67 ddraw: Don't destroy complex attached surfaces even if explicitely
requested as they will be liquidated anyway when the root is
destroyed.
2006-10-03 20:33:39 +02:00
Francois Gouget 66300403c4 ddraw: Only perform the screen resolution changing tests in interactive mode. 2006-10-02 11:54:39 +02:00
Francois Gouget ceb06a2f00 ddraw: Fix comparefloat() so it compiles with Visual C++ when given a negative value. 2006-09-29 17:53:12 +02:00
Michael Stefaniuc 85ce5117c5 Add a WINE_NO_LONG_INT define to many makefiles to ease the transition of DWORD/LONG/ULONG from long to int. 2006-09-29 16:08:30 +02:00
Alexandre Julliard 32ab895e46 makefiles: Generate the dependencies line to avoid some code duplication. 2006-09-14 09:38:16 +02:00
Stefan Dösinger 6286c4e70d ddraw: Pass the fullscreen flag to wined3d. 2006-09-10 10:18:45 +02:00
Stefan Dösinger 2d5b19c182 ddraw: Double buffered primary surfaces can only be created in EXLUSIVE mode. 2006-09-10 10:18:23 +02:00
Stefan Dösinger 49beec8635 ddraw: Return DDERR_NOPALETTEATTACHED if no palette is attached. 2006-09-10 10:18:12 +02:00
Andrew Talbot 8968f8d55d ddraw: Cast-qual warning fix. 2006-09-10 10:16:41 +02:00
Mike McCormack a8ae03f2d8 ddraw: Make tests pass when OpenGL libraries aren't present. 2006-09-07 10:22:02 +02:00
Alexandre Julliard 5cf75e615a makefiles: Only run test and documentation targets in directories that need them. 2006-08-28 13:37:44 +02:00
Andrew Talbot 04a0f74b63 ddraw: Write-strings warnings fix. 2006-08-23 16:53:55 +02:00
Stefan Huehner 998e256c82 Fix some -Wstrict-prototype warnings () -> (void). 2006-08-21 12:06:26 +02:00
Andrew Talbot 704f8d7848 ddraw: Write-strings warnings fix. 2006-08-17 11:24:21 +02:00
Dmitry Timoshkov c7ae07adf4 ddraw: Do not report DDCAPS_OVERLAY and friends since overlays are not supported. 2006-08-15 19:24:19 +02:00
Michael Stefaniuc 757ee19ca1 janitorial: Removed the rest of the redundant NULL checks before HeapFree. 2006-08-10 10:57:33 +02:00
Stefan Dösinger de5a2f3fbe ddraw: Implement D3DRENDERSTATE_TEXTUREMAPBLEND. 2006-08-09 20:35:24 +02:00
Yong Chi f0d6cba3a5 ddraw: Fix for incorrect return value from wined3d. 2006-08-09 12:39:47 +02:00
Francois Gouget ce9b4baad8 Assorted spelling fixes. 2006-08-07 13:52:55 +02:00
Mike McCormack d99c7d5939 ddraw: Don't link to wined3d, load it at runtime.
This lets ddraw dlls built on a machine with OpenGL present run on other 
machines that may not have the OpenGL libraries installed.
2006-08-03 18:20:31 +02:00
H. Verbeet 6add05d33b ddraw: Order Z-buffer formats by depth buffer bit depths in IDirect3DImpl_7_EnumZBufferFormats. 2006-07-31 10:53:09 +02:00
Stefan Dösinger 06106e2810 ddraw: Support using an application-provided surface pointer. 2006-07-26 15:17:59 +02:00
Stefan Dösinger bffe5a6922 ddraw/wined3d: Remove texture format enumeration functions. 2006-07-18 11:25:22 +02:00
Stefan Dösinger 915174d8d9 ddraw: Palette refcounting fix.
Do not AddRef the DirectDraw interfaces in CreatePalette of older
interface version, and add a test for that.
2006-07-11 17:10:53 +02:00
Stefan Dösinger 0a81295782 ddraw: Split up the ddraw refcount. 2006-07-11 17:10:17 +02:00
Alexandre Julliard 77dc0d9be5 .gitignore: Added wildcards to ignore generated resource files. 2006-07-10 21:39:00 +02:00
Alexandre Julliard 0fa8baafcb make_dlls: Recursively ignore .ok files in all tests directories. 2006-07-10 21:26:50 +02:00
Alexandre Julliard edd100b899 make_dlls: Recursively ignore testlist.c in all tests directories. 2006-07-10 21:19:42 +02:00
Alexandre Julliard 5258e061dc make_dlls: Ignore generated import libraries from the top-level .gitignore. 2006-07-10 20:55:58 +02:00
Alexandre Julliard cc2b3b48e6 Take advantage of the recursive nature of .gitignore for Makefile entries.
Prefix other entries with '/' to make them non-recursive.
2006-07-10 20:47:54 +02:00
Ivan Gyurdiev 85aa8ab855 wined3d: Add position_transformed flag to Strided data format. 2006-07-07 17:35:36 +02:00
Paul Vriens 8f143f190c Use the return value of register_key_guid. 2006-06-30 21:08:07 +02:00
Piotr Caban 2abfc391b4 ddraw: Added missing '\n' in debug traces. 2006-06-30 20:44:14 +02:00
Stefan Dösinger b0c7bee2ef ddraw: Fix some material related bugs. 2006-06-30 20:42:27 +02:00
Stefan Dösinger 44ace22445 ddraw: Matrix values in the execute buffer are handles. 2006-06-30 20:42:13 +02:00
Stefan Dösinger a509aabb97 ddraw: Correct a NULL pointer check. 2006-06-29 14:39:48 +02:00
Stefan Dösinger cea41b0a0f wined3d: Vertex buffer can be locked multiple times. 2006-06-27 21:14:02 +02:00
Stefan Dösinger 53fc3f6acc ddraw: Fix some compiler warnings. 2006-06-27 11:14:20 +02:00
Stefan Dösinger 92e48bcea5 ddraw: Assign the surface descriptions height to the height. 2006-06-27 11:14:13 +02:00
Francois Gouget 9bfbfcbeb4 Assorted spelling, case and grammar fixes. 2006-06-26 13:06:11 +02:00
Francois Gouget 5629f74d0d ddraw: Fix compilation with gcc 2.95. 2006-06-26 13:04:54 +02:00
Stefan Dösinger 36a8a8e6f3 ddraw: Set the video memory and visible flag on render targets. 2006-06-26 13:04:27 +02:00
Stefan Dösinger 546a60ff2f ddraw: Enumerate the reference d3ddevice. 2006-06-26 13:04:13 +02:00
Stefan Dösinger 495e46197a ddraw/wined3d: IDirectDrawSurface7::SetSurfaceDesc corrections. 2006-06-26 12:38:55 +02:00
Stefan Dösinger d50ff220d0 ddraw: Use the handle infrastructure for Matrix handles. 2006-06-22 12:04:26 +02:00
Stefan Dösinger 1e2413f4f4 ddraw: Implement proper handle management. 2006-06-19 11:14:18 +02:00
Stefan Dösinger 01273e7eb6 ddraw: Palette refcounting fixes + tests. 2006-06-19 10:29:56 +02:00
Alexandre Julliard 7f8c29a407 ddraw: Make some functions static. 2006-06-15 17:14:37 +02:00
Stefan Dösinger c8901d6f62 ddraw: Rewrite most of ddraw using WineD3D. 2006-06-15 16:51:16 +02:00
Michael Stefaniuc fee72b607a Yet another round of redundant NULL checks before HeapFree. 2006-06-13 11:40:23 +02:00
Jonathan Ernst 360a3f9142 Update the address of the Free Software Foundation. 2006-05-23 14:11:13 +02:00
Vitaliy Margolen 4054c06e55 directx: Update file versions to dx9c (compared to win2k). 2006-05-22 11:32:17 +02:00
Francois Gouget f7c24f37ad Various trace fixes.
Add trailing '\n's to trace calls.
Remove spaces before '\n'.
2006-05-15 15:05:09 +02:00
Robert Shearman 74407105d2 Check the return value from register_key_guid in all the DLL registering code. 2006-05-10 19:38:04 +02:00
Michael Stefaniuc a87520036f janitorial: Remove redundant NULL pointer checks before HeapFree'ing them.
Some HeapFree's are hidden behind macros. Found by smatch.
2006-05-10 11:31:41 +02:00
Stefan Dösinger dbdc8c2f65 ddraw: Add a test for IDirect3DVertexBuffer7::ProcessVertices. 2006-04-10 15:44:10 +02:00
Francois Gouget 6bddeb1cf7 Assorted spelling fixes. 2006-03-21 20:10:39 +01:00
Alexandre Julliard 8b3e426821 ddraw: Call DDRAW_ChooseDefaultDriver only on PROCESS_ATTACH. 2006-03-21 15:06:36 +01:00
Alexandre Julliard db0aabca25 ddraw: Don't crash in d3d test if OpenGL is missing. 2006-03-13 14:19:58 +01:00
Peter Beutner 07fe82dd55 ddraw: Fix transparent Blits on 8bit surfaces.
There are no red/green/blue bitmasks with color depth==8bpp. In that
case always match against the whole byte.
2006-02-27 12:20:21 +01:00
Stefan Dösinger 6e27152c96 ddraw: Small function corrections.
The pPlaneEquation parameter of IDirect3DDevice7::SetClipPlane is not const
IDirect3DDevice2::NextViewport takes an IDirect3DDevice2 interface, not an 
IDirect3DDevice3, the same for IDirect3DDevice::NextViewport.
2006-02-11 20:30:48 +01:00
Stefan Dösinger 531c487807 ddraw: ProcessVertices correction.
Use the texture index to get the texcoord size from the fvf, not the
vertex index.
2006-02-11 20:30:13 +01:00
Lionel Ulmer 00577aa605 ddraw: Better simulate what 'GetVerticalBlankStatus' does on real hardware. 2006-01-16 20:38:08 +01:00
Francois Gouget 8ca1f3fc14 Assorted spelling fixes 2006-01-03 12:10:50 +01:00
Ivan Leo Puoti 3cc9e40c3b ddraw: Fix DirectDrawSurface::QueryInterface crash. 2005-12-21 21:11:54 +01:00
Alexandre Julliard ae964ac801 Take advantage of the __EXCEPT_PAGE_FAULT macro. 2005-12-16 17:17:57 +01:00
Eric Pouech 8cddd5d2fb Made some functions static. 2005-12-12 11:53:56 +01:00
Rein Klazes 72caaad6cc ddraw: Catch access violations when calling DirectDrawEnumerateProc. 2005-12-05 20:40:42 +01:00
Alexandre Julliard 0ec7e1a591 Renamed all .cvsignore files to .gitignore. 2005-11-26 13:10:33 +01:00
Lionel Ulmer 4665deda9e Use the front buffer palette for DC operations on off-screen buffers. 2005-11-14 12:27:55 +00:00
H. Verbeet 9bf1fe622d Fix the default value for keylow in DIB_DirectDrawSurface_Blt.
Unset DDBLT_DDFX when lpbltfx is NULL / contains no dwDDFX.
2005-11-14 12:27:31 +00:00
Christian Costa d40302a833 Add DDBLT_DONOTWAIT flag.
Separate DDBLT_WAIT and DDBLT_ASYNC fixme in Blt method.
2005-11-14 11:22:20 +00:00
Francois Gouget 0edbaf7e80 Remove spaces before '\n' in traces. 2005-11-10 12:14:56 +00:00
Christian Costa be29e3708b Finish moving d3d[1..3] light code to use d3d7. 2005-10-31 10:05:15 +00:00
Christian Costa c656dfc39c Enumerate only requested modes by taking into account surface desc
when present.
2005-10-17 08:55:27 +00:00
Christian Costa 85155cc6be Disable depth test when there is no Z buffer attached.
Initialise texture states at creation instead of when tex name is
generated.
2005-10-12 21:05:40 +00:00
Lionel Ulmer 002608224d Add an assert if both arguments to DD_STRUCT_COPY_BYSIZE are equal. 2005-10-10 19:53:37 +00:00
Lionel Ulmer dfd1153f1d - do not pass private data to the application but a copy of it
- add some more traces
2005-10-10 10:44:23 +00:00
Lionel Ulmer ef735703e8 - pass a copy of the surface description to the application
- increase the surface reference count when giving the surface pointer
  to the caller
2005-10-10 10:28:05 +00:00
Raphael Junqueira 9e18b7efa9 Don't crash if pDDSD is NULL on DirectDrawSurface::Lock. 2005-10-07 15:01:02 +00:00
Stefan Dösinger 71af04b60c - Add handling for DDSCL_SETFOCUSWINDOW in SetCooperativeLevel.
- Print a fixme for DDSCL_CREATEDEVICEWINDOW  and
  DDSCL_SETDEVICEWINDOW.
- Don't allow DDSCL_EXCLUSIVE without DDSCL_FULLSCREEN.
2005-10-06 12:26:04 +00:00
Alexandre Julliard 7e22be4d84 We are no longer generating .dbg.c files. 2005-09-29 10:35:58 +00:00
Alexandre Julliard 860c4fe7de The clip list is in screen coordinates so we need to map the result of
GetRandomRgn if the Windows version is win9x.
2005-09-27 09:34:24 +00:00
Christian Costa 3d6154aa33 Implement Begin/Vertex/End rendering functions. 2005-09-25 15:18:18 +00:00