4131135a9f
d3d8: Cleanup the pixelshader handling code a bit.
...
This mostly just reduces the nesting to something more sane.
2009-03-24 12:56:33 +01:00
3f559f26d6
d3d8: Properly handle unsetting the pixelshader in SetPixelShader().
2009-03-24 12:56:25 +01:00
775ea907a3
d3d8: Fix locking.
2009-03-23 14:08:03 +01:00
72b5378758
d3d8: Get rid of resource.c.
2009-03-23 14:08:03 +01:00
7c0931b7c2
d3d8: Get rid of basetexture.c.
2009-03-23 14:08:03 +01:00
d4c2a387c8
d3d8/tests: Use ULONG instead of unsigned long.
2009-03-23 12:41:08 +01:00
24100cd026
d3d8: Release the d3d8 shader once we're done with it in IDirect3DDevice8Impl_GetPixelShader().
2009-03-13 11:28:35 +01:00
f9d82ed1de
d3d8: Handles aren't supposed to be pointers.
...
This might even make d3d8 a bit more 64-bit safe.
2009-03-10 12:08:58 +01:00
cbc8630019
d3d8: Make the shader handle table a bit more generic.
2009-03-10 12:08:32 +01:00
954c3e22e1
d3d8: Don't call Release() in a while loop.
...
There should only ever be a single reference to these objects, since only
their handle is exposed outside d3d8. Should there be more references than
that, calling Release() in a while loop probably isn't the right approach.
2009-03-10 12:07:59 +01:00
57d971121a
d3d8: Fix some sign compare warnings.
2009-03-10 12:07:41 +01:00
aa3027a604
wined3d: Merge IWineD3DVertexBuffer with IWineD3DBuffer.
...
That still leaves IWineD3DIndexBuffer, but that code is also mostly similar,
except for the conversion code (which will be unused there).
2009-03-06 15:35:58 +01:00
702eeb6b0c
wined3d: Add separate methods for setting the primitive type.
2009-03-05 16:16:25 +01:00
602bb1f551
wined3d: Pass the vertex count rather than the primitive count to wined3d draw methods.
2009-03-05 16:16:24 +01:00
1dc4d5caae
d3d8/tests: Use win_skip() and skip() where appropriate.
2009-03-02 12:29:01 +01:00
a1ca18eaf8
d3d8/tests: Fix a test failure on some boxes.
2009-02-25 14:05:36 +01:00
b6263f6664
d3d8/tests: Fix a test failure on VMware.
2009-02-25 14:05:31 +01:00
bd14f24b69
d3d8/tests: Use win_skip() to skip over unimplemented functionality.
2009-02-25 12:49:25 +01:00
0048a0373b
d3d10core: Keep a reference to the wined3d device in the d3d10 device.
2009-02-23 12:20:29 +01:00
8cefc47d81
wined3d: Add DXGI formats to WINED3DFORMAT.
2009-02-20 11:10:37 +01:00
d575b5fecb
d3d8: Explicitly convert between D3DFORMAT and WINED3DFORMAT values.
2009-02-20 11:09:54 +01:00
ae79b02ca6
d3d8/tests: Make tests pass on a W2K8 VM.
2009-01-27 11:30:03 +01:00
1f601015cd
d3d8: Make some device_parent_*() functions static.
2009-01-26 15:13:29 +01:00
b5eaca542e
d3d8: Properly test for dynamic usage in device_parent_CreateSurface().
2009-01-16 13:29:52 +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
357c3f4a2c
d3d8: Remove superfluous pointer casts.
2009-01-14 13:51:01 +01:00
a69c86d3f5
ddrawex: Add a test for the permanent DC function.
2009-01-09 16:26:06 +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
49da5031c2
d3d8/tests: Fix a test failure on VMware and VirtualBox.
2009-01-05 15:09:17 +01:00
007c648c20
d3d: Correct some debug levels.
2008-12-30 11:36:50 +01:00
ff409280e7
d3d8: Port the d3d9 stateblock tests to d3d8.
2008-12-30 11:36:11 +01:00
664b58dc6f
d3d: Make sure the device is properly released when exiting the tests.
2008-12-29 12:16:35 +01:00
4adb342327
wined3d: Remove GetFVF() and SetFVF() from IWineD3DDevice.
2008-12-17 14:02:03 +01:00
dfe41770e7
d3d8: Add a test for GetVertexShader() with a FVF set.
2008-12-16 12:52:16 +01:00
46572f682c
wined3d: Refuse to create shaders with a NULL function.
2008-12-16 12:51:49 +01:00
62497e8772
d3d8: Remove unused code.
...
Also corrects some related comments.
2008-12-16 12:51:40 +01:00
0a47e1beb4
d3d8: Use the wined3d declaration to retrieve the d3d8 shader in IDirect3DDevice8Impl_GetVertexShader().
...
This makes it no longer necessary to create a wined3d vertex shader
when the d3d8 vertex shader has a NULL function.
2008-12-15 14:00:46 +01:00
b9468a89fc
d3d8: Create a d3d8 declaration as parent for FVF based declarations.
2008-12-15 14:00:37 +01:00
ec7cbc26f5
d3d8: Make D3D8CB_CreateSurface() static.
2008-12-15 12:25:02 +01:00
855ce5bd86
d3d8/tests: Skip tests if we can't create the D3D8 object.
2008-12-04 12:51:18 +01:00
00e0d1510b
d3d8: Make a function static.
2008-12-04 12:46:52 +01:00
a6917b143d
wined3d: Use IDL to generate wined3d.h.
2008-11-25 13:37:22 +01:00
d3c7b2f7cc
d3d8: Remove WINAPI on static functions where not needed.
2008-11-24 14:18:42 +01:00
4f199a10ad
Remove the remaining casts of NULL.
2008-11-03 13:42:09 +01:00
93af8d3631
d3d: Do not restore the display mode in ddraw.
2008-11-03 13:34:13 +01:00
30a504bab8
d3d8: Don't ignore the GetCursorInfo() return value (LLVM/Clang).
2008-11-03 11:49:27 +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
7f327237bf
Convert remaining source files to utf-8.
2008-10-18 19:23:08 +02:00
38abbe3d60
d3d8/tests: Fix test on win9x with broken driver.
2008-10-13 12:03:25 +02:00
f7cacc1f09
d3d8: Initialize IDirect3DDevice8 *device to NULL in case of immediate cleanup (Coverity 795).
2008-10-07 15:21:20 +02:00
0f236745a9
d3d8/9: Use WINED3D_OK instead of D3D_OK in vertexshader.c.
2008-10-06 13:07:02 +02:00
941801c548
d3d8: Fix incorrect ordering of brackets in IDirect3DVertexShader8Impl_GetDevice.
...
The comparison should be (D3D_OK == hr && myDevice), not (D3D_OK == (hr && myDevice)).
(Found with PreFast.)
2008-09-30 10:20:41 -05:00
8f07e99ec5
d3d8: Add a test for auto depth stencil reset.
2008-09-10 12:05:45 +02:00
43f5d8e5ad
d3d8: Fix IDirect3DDevice8::SetRenderTarget().
...
The render target should be left alone if the render target argument is
NULL. WineD3D calls should be done inside the critical section.
2008-09-10 12:05:25 +02:00
01539fb926
d3d8: GetDepthStencilSurface returns D3DERR_NOTFOUND when no depth stencil is present.
2008-09-10 12:05:10 +02:00
d5f05c59c7
ddraw: Beware of the surface type when checking for format support.
2008-09-02 14:56:26 +02:00
acaeb92042
d3d8/d3d9: Remove unconsistent tests for SetMaterial.
2008-08-22 11:32:09 +02:00
898c2c9778
d3d8: Don't store shader_handle's.
...
They're not stable across table resizes.
2008-08-20 10:26:51 +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
9ba3d03e78
d3d8: Fix IDirect3DDevice8::CreateImageSurface pool type.
2008-07-08 21:08:32 +02:00
413ce31eff
d3d8: Add testcase for IDirect3DDevice8::CreateImageSurface.
2008-07-08 20:39:08 +02:00
f98157f601
d3d8: Don't depend on the dxerr8 static library in the tests.
2008-07-08 17:51:45 +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
873c0afb82
d3d: Allow more imprecision in the texop test.
2008-06-25 20:29:05 +02:00
3546b8bbfc
d3d8: Use color_match() in alpha_test().
...
Also fixes some of the messages.
2008-06-24 11:48:32 +02:00
360d87f420
d3d8: Make Direct3DCreate8 fail if we can't initialize wined3d.
2008-06-24 11:07:43 +02:00
a52224a48b
d3d8: Fix typo in test.
2008-06-20 11:19:34 +02:00
92dfc02b01
d3d8: Avoid a not needed address-of operator.
2008-06-06 10:29:14 +02:00
2f6fbdec8c
d3d8: Test our texop implementation.
2008-05-27 12:04:29 +02:00
14b13d0687
d3d: Use an alpha capable backbuffer format in the visual tests.
2008-05-27 12:04:05 +02:00
c8d495bac1
d3d8: Dangling pointers fix.
2008-05-05 19:46:15 +02:00
dad21bbcbf
makefiles: List the static libraries as normal imports instead of extra libs.
2008-04-30 14:23:55 +02:00
537c4babed
d3d8: Fix a few test failures in win2k3.
2008-04-25 11:33:47 +02:00
7df193676e
wined3d: Fix a possible null dereference.
2008-04-21 16:54:00 +02:00
d6ba069d9e
wined3d: Improve detection of device palette change.
2008-04-03 11:31:57 +02:00
0fa0df7843
d3d8: Reject broken normal declaration types with fixed function.
2008-03-28 14:49:30 +01:00
06d429d6b6
Spelling fixes.
2008-03-27 20:48:19 +01:00
4777f26d61
Spelling fixes.
2008-03-27 11:10:07 +01:00
8869c0f147
d3d: De-pointerize the WINED3DCAPS structure.
2008-03-25 19:36:38 +01:00
94949ab849
d3d8/tests: Test DrawIndexedPrimitiveUP with primitive count zero.
2008-03-24 20:40:24 +01:00
785e6fa61f
d3d8/tests: Cover one more case in p8_texture_test.
...
Test if a P8 texture gets properly updated if there was a palette change while
this texture wasn't bound to any stage.
2008-03-10 12:54:54 +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
57d506f654
d3d8/tests: Add a P8 texture test.
2008-02-25 12:38:37 +01:00
4c8e218252
Assorted spelling fixes.
2008-02-15 12:09:24 +01:00
980ee365a0
wined3d: Use unsigned int instead of size_t for element counts.
2008-01-07 17:17:04 +01:00
55e92b9410
d3d8: Fix type of loop variable.
2008-01-04 12:12:31 +01:00
21a9c2d2f9
wined3d: Removed dead FIXME checks.
2008-01-03 11:53:29 +01:00
70d82dfbd9
d3d8: Remove unneeded casts.
2008-01-02 12:38:41 +01:00
f700cbe74b
wined3d: Add an alpha blending test.
2007-12-07 16:26:43 +01:00
ad9396302d
Removed some unneeded imports.
2007-12-06 21:24:24 +01:00
cd2964483a
d3d8: Remove unneeded casts.
2007-12-05 12:04:39 +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
f0c479d6f7
d3d8: Destroy the window after the visual test.
2007-11-20 13:10:51 +01:00
6cecaa9852
d3d8: Release the vertex declarations array when destroying the device.
2007-11-20 12:53:00 +01:00
4bd65f2a66
d3d8: Initialize the vertex decl when allocating it.
2007-11-05 13:24:36 +01:00
d0fdb1ea7e
d3d: Add a test for double surface locking.
2007-08-31 11:25:19 +02:00
6ec6c941fa
wined3d: BaseVertexIndex can be negative.
2007-08-27 12:00:42 +02:00
a06e002e93
wined3d: Add a wined3d private WINED3DSBT_RECORDED.
2007-08-15 09:36:20 +02:00
c20a285510
d3d8/tests: Make tests run again on win95.
2007-08-14 12:45:57 +02:00
a9abf580b5
d3d8/tests: DXGetErrorString8() prints 'Unknown' for too many hresults which makes diagnosis impossible. So print the raw code instead.
2007-08-10 11:55:58 +02:00
2d15cb8b27
d3d: Add a simple offscreen rendering test.
2007-08-08 15:32:00 +02:00
573db35bf6
d3d8: Skip tests if d3d is not supported.
2007-08-06 12:05:17 +02:00
69958262eb
d3d8: Better match the PSDK types and fix the winapi_check warnings.
2007-08-03 12:44:22 +02:00
e70adcd8b6
d3d8: Only test pixel shaders if they are supported.
2007-07-30 23:37:58 +02:00
19c574b7e5
d3d8: Use a less demanding format for the depth stencil test.
2007-07-30 23:37:58 +02:00
9a06fd000b
d3d8: Only test volume textures if they are supported.
2007-07-30 23:37:58 +02:00
6ff16b9f2e
d3d8: Only test cube textures if they are supported.
2007-07-30 23:37:58 +02:00
630d602631
d3d8: Only test pixel shaders for refcounting if they are supported.
2007-07-30 12:50:12 +02:00
5016f48daa
d3d8: Skip volume test if volume textures are not supported.
2007-07-30 12:50:06 +02:00
a1f83aae8e
wined3d: rsq and rcp use the .w component if no swizzle is given.
2007-07-03 12:29:34 +02:00
527295e57f
d3d8: Convert fvfs to vertex declarations.
2007-06-21 13:08:57 +02:00
078523f73e
wined3d: Present does not clear the depth stencil.
2007-06-14 13:22:19 +02:00
00c8dbe2aa
d3d8: Hold the lock in IDirect3Dtexture8 methods.
2007-06-13 11:08:20 +02:00
e980058f58
d3d8: Hold the lock in IDirect3DVolumeTexture8 methods.
2007-06-13 11:08:14 +02:00
3e8948c173
d3d8: Hold the lock in volume methods.
2007-06-13 11:08:06 +02:00
68d4fbeab3
d3d8: Hold the lock in IDirect3DVertexBuffer methods.
2007-06-13 11:07:59 +02:00
1bf30c037c
d3d8: Hold the lock in swapchain methods.
2007-06-13 11:07:52 +02:00
34d1beed74
d3d8: Hold the lock in IDirect3DSurface8 methods.
2007-06-12 11:14:16 +02:00
1ec8788b34
d3d8: Hold the lock in IDirect3DIndexBuffer8 methods.
2007-06-12 11:14:01 +02:00
e96287e49c
d3d8: Hold the lock in cubetexture methods.
2007-06-12 11:13:49 +02:00
09aefe2108
d3d8: Hold the lock in IDirect3DDevice8 methods.
2007-06-11 13:54:33 +02:00
6ee356fca0
wined3d: Get rid of the pBaseVertexIndex parameter to IWineD3DDeviceImpl_GetIndices, use GetBaseVertexIndex instead.
2007-06-07 11:20:48 +02:00
4f14c4700e
d3d8: Hold the DLL lock in IDirect3D8 methods.
2007-06-06 13:39:49 +02:00
193ccecaee
d3d8: Add a dll global critical section.
2007-06-06 13:39:36 +02:00
785771272a
wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead.
2007-06-06 12:10:47 +02:00
f64f30cdba
d3d8/tests: Fix the Visual C++ double to float conversion warnings.
2007-05-29 13:46:56 +02:00
d476313a49
direct3d: Remove misspelled constants as they exist correctly spelled.
2007-05-21 12:38:54 +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
2c7328891b
d3d8: Add a surface locking test.
2007-05-04 13:41:30 +02:00
7b48db196f
d3d: Fix the surface locking rectangle validation.
2007-05-04 13:41:13 +02:00
94b3fddec8
d3d: Pass the cube face to Create*Texture's surface creation callback.
2007-05-01 11:42:25 +02:00
725057da47
d3d: Remove dependency on ddraw.h header.
2007-04-16 13:20:15 +02:00
fb367f813a
d3d8: Void functions should not return a value.
2007-04-09 12:15:28 +02:00
ea0d7f17ca
d3d8: Add missing relay trace.
2007-04-07 11:01:26 +02:00
c343fb1cdf
wined3d: Make CreateCubeTexture fail when not supported.
2007-04-02 11:28:39 +02: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
c912f791ee
d3d8/tests: Use skip as is done in the other tests.
2007-03-12 12:21:49 +01:00
6bed8536be
d3d8: Add tests for GetVertexShaderDeclaration, GetVertexShaderFunction and GetPixelShaderFunction.
2007-03-08 11:58:57 +01:00
b68c72faef
d3d8: Implement IDirect3DDevice8_GetVertexShaderDeclaration.
2007-03-08 11:58:41 +01:00
138826b8cc
d3d8: Save the d3d8 vertex declaration.
2007-03-08 11:58:23 +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
bbcf98209c
wined3d: No bounds checking is done on sampler / texture numbers.
2007-02-20 11:49:42 +01:00
ef68e32b03
wined3d/d3d8: Move todo about sw vp usage to d3d8.
2007-02-20 11:45:56 +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
d74712690c
d3d8: Set WINED3DPRESENT_PARAMETERS.MultiSampleQuality to a valid pointer.
2007-02-15 17:22:35 +01:00
a43cb2807a
d3d8: Avoid a size_t printf format warning.
2007-02-14 14:43:14 +01:00
157205c085
d3d8: Don't store the d3d8 declaration in the wined3d object.
2007-02-14 13:56:50 +01:00
efed9aea1f
d3d8: Move loading local d3d8 vertex shader constants from wined3d to d3d8.
2007-02-14 13:54:55 +01:00
dea795f7ac
d3d9: Don't store the d3d9 declaration in the wined3d object.
2007-02-14 13:54:42 +01:00
32e5cac2be
wined3d: Get rid of the vertexDeclaration field in IWineD3DVertexShaderImpl.
2007-02-14 13:54:29 +01:00
5ad6766c85
d3d8: Store the d3d8 vertex declaration in the d3d8 vertex shader.
2007-02-14 13:54:17 +01:00
a0b417725a
d3d8: Add an IDirect3DVertexDeclaration8 class to hold the wined3d vertex declaration.
2007-02-14 13:50:57 +01:00
00aa8ab08c
d3d8: Deleting bound shaders unbinds them.
2007-02-13 12:07:46 +01:00
67b1f4a7e9
wined3d: BeginScene and EndScene tests and fixes.
2007-02-12 12:08:34 +01:00
a76e6b11b0
d3d8/tests: Warn that tests were skipped if we could not load d3d8.dll.
...
But report a failed test if a mandatory function is missing from it.
2007-01-12 11:25:27 +01:00
d73e5d6fc8
d3d8: IDirect3DDevice8Impl_GetVertexShaderDeclaration gets passed a handle instead of a pointer.
2007-01-08 11:46:05 +01:00
6e3b732ffb
d3d8: IDirect3DDevice8Impl_GetVertexShaderFunction gets passed a handle instead of a pointer.
2007-01-08 11:46:05 +01:00
cae630f92e
d3d8: IDirect3DDevice8Impl_GetPixelShaderFunction gets passed a handle instead of a pointer.
2007-01-08 11:46:05 +01:00
71631f7638
wined3d: Use the baseVertexIndex in the stateblock.
2007-01-03 11:02:51 +01:00
e236d91ab8
d3d8: Fix failing tests on windows, when no 3d hardware acceleration is available.
2007-01-02 13:24:14 +01:00
005efa740b
d3d8/tests: Avoid sizeof in traces.
2006-12-29 12:49:43 +01:00
b66a52856c
d3d8: Don't report Shader Model 2.0 or higher.
2006-12-29 12:49:41 +01:00
b7b9d4e3c7
d3d: GetStreamSource on a stream with NULL data isn't an error.
2006-12-26 12:52:54 +01:00
ed21935479
d3d: Fix adapter mode enumeration and filtering.
2006-12-20 17:58:34 +01:00
87083c9d71
d3d8: Handle volume container in d3d8.
2006-12-18 12:07:54 +01:00
0531858146
d3d8: Handle surface container in d3d8.
2006-12-18 12:07:46 +01:00
5e0fc62135
d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice.
2006-12-18 12:07:26 +01:00
46028b0832
wined3d: D3DRS_ZVISIBLE is not supposed to return an error.
2006-12-15 12:18:36 +01:00
5dbd834ca0
d3d8: Release non implicit surfaces only if refcount is 0, with test.
2006-12-14 12:57:27 +01:00
4745618487
d3d8: Fix implicit surface refcounting.
2006-12-06 12:41:27 +01:00
0a3f417359
d3d8: Handle volume refcount forwarding in d3d8.
2006-12-06 12:40:24 +01:00
0d725490d6
d3d8: Handle surface refcount forwarding in d3d8.
2006-12-06 12:40:12 +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
44e6c6b67a
d3d8: Use correct COM macros.
2006-12-01 12:27:17 +01:00
bd072332e1
Revert "d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.".
...
This reverts commit 167b83c28a
2006-11-30 16:04:00 +01:00
f8e7ddd798
Revert "d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.".
...
This reverts commit 478a414e58
2006-11-30 16:04:00 +01:00
b657cd5f58
Revert "d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.".
...
This reverts commit a7518f6f54
2006-11-30 16:04:00 +01:00
f5204b8afe
Revert "d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.".
...
This reverts commit 18546a65e6
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
3a270375d7
Revert "d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.".
...
This reverts commit 16b1e046d8
2006-11-30 16:03:59 +01:00
9dd81f64cb
Revert "d3d: Remove AddRef from IWineD3DDevice_GetIndices.".
...
This reverts commit 5c4008719c
2006-11-30 16:03:59 +01:00
5c4008719c
d3d: Remove AddRef from IWineD3DDevice_GetIndices.
2006-11-22 11:40:43 +01:00
16b1e046d8
d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.
2006-11-22 11:40:37 +01:00
274df6ef88
d3d: Remove AddRef from IWineD3DDevice_GetTexture.
2006-11-22 11:40:31 +01:00
18546a65e6
d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.
2006-11-22 11:40:24 +01:00
a7518f6f54
d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.
2006-11-22 11:40:05 +01:00
478a414e58
d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.
2006-11-22 11:39:52 +01:00
167b83c28a
d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.
2006-11-22 11:39:39 +01:00
07fad29c7d
d3d8: Show that the implicit surfaces are not freed if refcount reaches 0.
2006-11-16 12:48:45 +01:00
ee7bf7954d
d3d8: Test AddRef with refcount==0.
2006-11-15 11:25:31 +01:00
577d5d2580
d3d8: Test refcount forwarding.
2006-11-15 11:25:18 +01:00
886c196e05
d3d8: Back buffer is identical to the render target, test it only once.
2006-11-15 11:25:07 +01:00
100038dfb1
d3d8: Add GetContainer tests for implicit surfaces.
2006-11-10 11:36:48 +01:00
b3225ea420
d3d8: Add refcount tests for implicit surfaces.
2006-11-09 17:45:56 +01:00
7cbf2a38cb
d3d8: Backport volume tests.
2006-11-09 12:45:16 +01:00
ede4b06443
d3d8: Backport IDirect3DVolume9Impl_GetContainer.
2006-11-09 12:45:03 +01:00
019bf2eabd
d3d8: Backport texture tests.
2006-11-09 12:44:54 +01:00
75d6d6203b
d3d8: Backport missing device tests.
2006-11-09 12:44:39 +01:00
bef60f1dfc
d3d8: Backport null pointer check in SetCursorProperties.
2006-11-09 12:44:22 +01:00
4471ad44a3
d3d8: Cast-qual warnings fix.
2006-10-27 12:10:04 +02:00
5f1a80a47b
d3d8: Backport d3d9 surface tests.
2006-10-17 11:16:05 +02:00
dd8682e9c5
d3d8: Fix wrong function name in FIXME.
2006-10-17 11:14:15 +02:00
1e6a38967c
d3d8: Implement CopyRects with BltFast.
2006-10-16 11:26:00 +02:00
58162f87fd
Assorted spelling fixes.
2006-10-13 11:55:04 +02:00
9628a1b2e2
wined3d: Merge D3DRECT types into one type in WINED3D namespace.
2006-10-12 12:37:08 +02:00
ac37163124
wined3d: Merge D3DMATRIX types into one type in WINED3D namespace.
2006-10-12 12:35:00 +02:00
732e0e908b
wined3d: Merge GAMMARAMP types into one type in WINED3D namespace.
2006-10-11 12:22:01 +02:00
5f2987ae32
wined3d: Merge VIEWPORT types into one type in WINED3D namespace.
2006-10-11 12:21:54 +02:00
90f5be2bef
wined3d: Merge MATERIAL types into one type in WINED3D namespace.
2006-10-11 12:21:14 +02:00
70bbf734b1
wined3d: Merge LIGHT types into one type in WINED3D namespace.
2006-10-11 12:21:06 +02:00
a5d0342010
d3d8/tests: Win64 printf format warning fixes.
2006-10-10 19:59:01 +02:00
c6e0ca28d5
d3d8: Win64 printf format warning fixes.
2006-10-10 19:58:56 +02:00
7d0f8a32e2
d3d8: Don't crash if d3d8 can't be loaded.
2006-10-07 18:04:43 +02:00
3529560cd7
wined3d: Add WINED3DUSAGE_OVERLAY.
2006-10-06 12:53:24 +02:00
82babbee0b
Add missing '\n's to Wine traces.
2006-10-05 17:46:48 +02:00
3adb46f050
d3d8: Fix '\n' typo.
2006-10-05 17:44:51 +02:00
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
9e0426538a
d3d8: Remove no longer used imports.
2006-09-26 20:01:43 +02:00
34e03fc042
d3d8: More correct stub for ValidatePixelShader + tests.
2006-09-20 12:24:23 +02:00
32ab895e46
makefiles: Generate the dependencies line to avoid some code duplication.
2006-09-14 09:38:16 +02:00
112810a480
d3d8: Free the shader handle table.
2006-09-12 10:52:47 +02:00
9002468c7b
d3d8: Better stub for ValidateVertexShader + tests.
2006-09-11 11:29:56 +02:00
5cf75e615a
makefiles: Only run test and documentation targets in directories that need them.
2006-08-28 13:37:44 +02:00
9a4ce31737
d3d8: Use proper handles for pixel shaders.
2006-08-28 11:49:06 +02:00
4a48e38e7d
d3d8: Improve shader handle management.
2006-08-28 11:47:02 +02:00
7ac5bd67d5
d3d: Don't crash when SetRenderTarget() is called with a NULL pSurface.
2006-08-07 13:12:37 +02:00
77dc0d9be5
.gitignore: Added wildcards to ignore generated resource files.
2006-07-10 21:39:00 +02:00
0fa8baafcb
make_dlls: Recursively ignore .ok files in all tests directories.
2006-07-10 21:26:50 +02:00
edd100b899
make_dlls: Recursively ignore testlist.c in all tests directories.
2006-07-10 21:19:42 +02:00
5258e061dc
make_dlls: Ignore generated import libraries from the top-level .gitignore.
2006-07-10 20:55:58 +02:00
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
145442a79d
d3d8: Fix remaining refcount tests and tighten all tests.
2006-07-07 16:57:41 +02:00
cea41b0a0f
wined3d: Vertex buffer can be locked multiple times.
2006-06-27 21:14:02 +02:00
558fbb8af8
d3d8: Remove dependencies on OpenGL headers and libraries.
2006-06-15 16:51:57 +02:00
3862f8e3d7
wined3d: Support more than one back buffer.
2006-06-15 16:51:41 +02:00
7bf49faf23
d3d8: Don't use sizeof in traces to avoid printf format warnings.
2006-06-13 14:09:36 +02:00
142a62be74
d3d8: Make some test functions static.
2006-06-12 13:21:47 +02:00
c3bd09e563
d3d8: Make the virtual table functions static where possible.
2006-06-10 11:48:24 +02:00
d06aa8d857
d3d8: Fix QueryInterface.
...
QueryInterface should return S_OK on success and set the object
pointer to NULL on failure. This is similar to the patch Ivan
submitted a while ago for wined3d.
2006-06-07 15:28:06 +02:00
6311d44488
d3d8: Backport of the d3d9 swapchain test to d3d8.
2006-05-31 11:44:47 +02:00
1c46c693c7
d3d8: Back buffer count fix.
2006-05-31 11:44:32 +02:00
360a3f9142
Update the address of the Free Software Foundation.
2006-05-23 14:11:13 +02:00
4054c06e55
directx: Update file versions to dx9c (compared to win2k).
2006-05-22 11:32:17 +02:00
1175a2f3a2
d3d8: Add refcount test.
2006-05-22 11:31:36 +02:00
1cc318c5a6
d3d8: All objects created by device should keep reference to it.
2006-05-22 11:29:27 +02:00
5c4a1fc8de
d3d8: Fix GetDesc and GetLevelDesc for surfaces and textures.
...
In DX8 the D3DSURFACE_DESC structure has a size field which needs to be set.
2006-05-20 17:47:45 +02:00
d04f0507cf
wined3d: Implement Init3D and Uninit3D.
2006-04-19 12:43:22 +02:00
03b256b16d
wined3d: Add a parameter for surface type selection.
2006-04-18 11:09:17 +02:00
ffc8e46e76
wined3d: Add IWineD3DSurface::Blt.
2006-04-17 11:19:30 +02:00
d2510847b0
wined3d: Split device creation and opengl initialization.
2006-04-13 11:22:45 +02:00
99136998e2
d3d8: VertexShader should keep reference to the parent device object.
2006-04-12 11:20:07 +02:00
cf4b91f074
wined3d: Add WINED3DBOX to wined3d_types.h.
2006-04-07 14:55:50 +02:00
e71468c786
wined3d: Add WINED3DLOCKED_BOX to wined3d_types.h.
2006-04-07 11:46:36 +02:00
bbe490abcc
wined3d: Add WINED3DLOCKED_RECT to wined3d_types.h.
2006-04-06 22:23:31 +02:00
be720179b6
wined3d: Add WINED3DCUBEMAP_FACES to wined3d_types.h.
2006-04-04 20:01:10 +02:00
c289b3cc51
wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP.
2006-04-04 20:00:41 +02:00
08c38a87e1
wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h.
2006-04-04 11:51:37 +02:00
f6ed704f96
wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS.
2006-04-03 21:35:44 +02:00
fc13420770
d3dx: VertexBuffer should keep reference to the parent device object.
2006-04-03 14:14:24 +02:00
0ad31f819d
wined3d: Add WINED3DBACKBUFFER_TYPE to wined3d_types.h.
2006-04-03 12:17:35 +02:00
fce54bcc49
wined3d: Add WINED3DDISPLAYMODE to wined3d_types.h.
2006-04-03 12:17:22 +02:00
6a8578f847
wined3d: Add WINED3DDEVTYPE to wined3d_types.h.
2006-03-30 12:45:57 +02:00
1e421c7da9
d3d8: Add a TRACE for IDirect3DDevice8Impl_CreateVertexBuffer.
2006-03-28 17:52:59 +02:00
1d47556195
wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.
2006-03-28 17:51:45 +02:00
d75fd75d48
wined3d: Add WINED3DPOOL to wined3d_types.h.
2006-03-28 17:34:42 +02:00
b4b295c2a5
wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h.
2006-03-27 11:30:49 +02:00
0f7eb52789
wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.
2006-03-27 11:30:49 +02:00
6af24c816d
wined3d: Rectpatch code fix.
...
Update the wined3d code to use WINED3DRECTPATCH_INFO, which was added
with an older patch.
2006-03-24 12:13:50 +01:00
bb370f3582
d3d8: Change the default debug channel to d3d8 for device.c.
2006-03-20 12:09:33 +01:00
2940fd9170
d3d8: Downgrade a FIXME to a TRACE in IDirect3DDevice8Impl_SetVertexShader.
2006-03-20 12:09:10 +01:00
0ea6686134
d3d8: Fix comparison in IDirect3DDevice8Impl_DeleteVertexShader.
2006-03-20 12:09:00 +01:00
bcbf5f397e
d3d8/wined3d: Vertex shader fixes.
2006-03-17 13:11:06 +01:00
6cc87406cf
wined3d: Add WINED3DINDEXBUFFER_DESC to wined3dtypes.h.
2006-03-15 11:30:39 +01:00
9f46792ba2
wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h.
2006-03-13 13:32:01 +01:00
913df5b143
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-10 21:43:00 +01:00
07004966a8
wined3d: Fix the relation between volumes and their container.
2006-03-06 20:08:36 +01:00
f7356a34c3
wined3d: Fix the relation between surfaces and their container.
2006-03-06 20:08:22 +01:00
339a4dbd5b
d3d: Fix Validate(Pixel|Vertex)Shader() prototypes.
...
Fix Validate(Pixel|Vertex)Shader() prototypes so they match the spec file.
Fix the stub message so it is more standard and use consistent
parameter names.
2006-03-03 13:17:20 +01:00
555a06075f
d3d8: Remove spaces before '\n'.
2006-02-28 12:01:47 +01:00
a9665eda79
d3d8: Header cleanup.
...
Remove unneeded structures and functions from d3d8_private.h, clean
some datatypes up and remove d3dcore_gl.h.
2006-02-28 12:01:30 +01:00
d13469c1d8
d3d8: Moved the remaining code over to WineD3D (based on patches by
...
Oliver Stieber).
2006-02-27 12:20:03 +01:00
a323238301
d3d8: Remove spaces before '\n', spelling fix.
2006-02-24 21:07:47 +01:00
b24e69dc38
d3d8: Move the capability detection code over to WineD3D.
...
Let the few existing parts which need the capabiliteis use the WineD3D
capability structure (gl_info). This info structure contains next to
'flags' inidicating certain features also all GL/GLX functions
pointers. Because D3D8 moves over to the wined3d gl_info structure all
the gl prototypes in d3dcore_gl.h were unneeded and removed.
2006-02-21 11:28:58 +01:00
3da999a1f7
d3d8: Move texturing code over to wined3d (based on Oliver Stieber's work).
2006-02-20 11:11:35 +01:00
45bf26cbdb
d3d8: Fixed compile with older GL versions.
2006-02-16 12:10:41 +01:00
4e4fc93645
d3d8: Move d3d8 surface over to wined3d (based on the work of Oliver Stieber).
2006-02-14 17:13:19 +01:00
a874487f95
d3d8: fbconfig fix.
...
Right now the ActiveRender code in D3D8 requests a GLX_DEPTH_SIZE of
32 in case the direct3d color format also has a depth of 32. As
verified on various linux drivers (Ati fglrx, Ati (dri) and Nvidia)
the color depth needs to be 24. This patch sets the depth to 24 and it
fixes bugs in 3dmark2001 and other programs.
2006-02-07 16:51:08 +01:00
e9c3f601ea
d3d8: Use GL_EXTCALL to call OpenGL extension glPointParameterfvARB.
2006-02-05 12:19:13 +01:00
172a9e1fcd
d3d8: Add detection for GL_ARB_point_parameters support.
2006-02-05 12:19:04 +01:00
d68f7a68c0
d3d8: Fixed point sprite scaling when size < 1.0f.
2006-02-04 17:14:38 +01:00
ecacc1ebcb
d3d8: Fixed POINTSPRITEENABLE.
2006-02-04 17:14:13 +01:00
80c82f527f
d3d8: Fixed POINTSCALEENABLE.
2006-02-04 17:13:13 +01:00
c1c3cc2a07
d3d8: CreateDevice should use the root of the current window.
2006-01-30 18:16:33 +01:00
ac16181790
d3d8: For render states D3DRS_POINTSPRITEENABLE and
...
D3DRS_MULTISAMPLEANTIALIAS, use GL_SUPPORT correctly.
2006-01-23 11:26:25 +01:00
66770e4ca0
d3d8: Add GL_ARB_multisample definitions.
2006-01-23 11:26:15 +01:00
76319f7c8d
d3d8: Add detection for GL_ARB_point_sprite support.
2006-01-23 11:24:27 +01:00
b645b9ed53
d3d8: Added GL_ARB_point_sprite definition.
2006-01-19 12:40:05 +01:00
624efed78e
d3d8: Render state additions.
...
Implemented D3DRS_EDGEANTIALIAS.
Implemented D3DRS_POINTSPRITEENABLE.
Implemented D3DRS_MULTISAMPLEANTIALIAS.
2006-01-17 15:58:43 +01:00
0ec7e1a591
Renamed all .cvsignore files to .gitignore.
2005-11-26 13:10:33 +01:00
6d442aeb34
Assorted spelling fixes.
2005-11-23 20:14:43 +01:00
0edbaf7e80
Remove spaces before '\n' in traces.
2005-11-10 12:14:56 +00:00
8a4c4ef278
Remove already included headers.
2005-11-07 11:07:19 +00:00
74c6321a15
- defined D3DCOLOR_B macros to access byte values of D3DCOLOR
...
- use D3DCOLOR macros instead of using shift + masks
- fix a bug where diffuse.lpData checked instead of specular.lpData
- implement color fixup on ARB VShader compilation code:
-> on input parameters using swizzle
-> add is_color parameter on vshader_program_add_param
2005-11-03 09:54:31 +00:00
009cc4e403
Release the OpenGL context when the device is released.
2005-10-27 12:08:00 +00:00
9c676e6c19
Changed index and vertex buffer so that internal references are
...
counted separately to external ones.
2005-10-27 10:23:41 +00:00
bda8a5c08a
Allow cube textures to be updated.
2005-10-13 13:44:03 +00:00
7e22be4d84
We are no longer generating .dbg.c files.
2005-09-29 10:35:58 +00:00
9a86a0b046
Fix DXT2 & DXT4 support for d3d8.
2005-09-29 10:31:22 +00:00
f469b6f8de
Fix missing prototypes when using nVidia OpenGL headers.
2005-09-28 18:12:00 +00:00
6ccb80d9a5
Documentation tweaks to make winapi_check happy.
2005-09-26 09:52:56 +00:00
f7eb64ce97
Correct the number of parameters (and partly their names) for the
...
undocumented functions ValidatePixelShader and ValidateVertexShader.
2005-09-21 09:42:20 +00:00
840eca52f6
Fix gcc 4.0 warning.
2005-09-09 14:50:29 +00:00
20366e7956
Use wined3dformat when calling wined3d.
2005-08-29 09:32:44 +00:00
1766483e4c
Fix gcc 4.0 warnings.
2005-08-09 10:22:03 +00:00
49b7fdcfc0
Removed the broken mmap64 configure check, and moved the
...
_FILE_OFFSET_BITS define to wine/port.h. Made sure that all files that
need the define include it.
2005-08-03 21:25:10 +00:00
ebf4e53030
Fix sign warnings.
2005-07-28 10:16:54 +00:00
190e1597ff
Fix some missing-declarations warnings.
2005-07-14 12:19:53 +00:00
2d7ea23868
Interlocked LONG* gcc warning fixes.
2005-07-11 13:21:17 +00:00
28dc5a8afc
Assorted spelling fixes.
2005-07-11 10:59:41 +00:00
8e0fb66664
Fixed signedness issues.
2005-07-10 17:48:20 +00:00
d7b9a23afd
gcc 4.0 -Wpointer-sign fixes (Reg* functions).
2005-07-06 19:08:05 +00:00
02c25a8981
Assorted spelling fixes.
2005-06-30 18:19:33 +00:00
46e7c30a71
Implement swapchains.
2005-06-23 11:05:24 +00:00
ab88743c25
Moved a few registry keys from HKLM\Software\Wine to
...
HKCU\Software\Wine for consistency.
2005-06-20 16:04:32 +00:00
e70e3ba0ff
Change the way caps are sent between d3d9/d3d8 and wined3d to make it
...
easier for wined3d to support additional versions of Direct3D.
2005-06-17 09:59:03 +00:00
2e4bca9db5
Added magic comments to all Wine-specific registry accesses to make
...
them easier to grep.
2005-06-13 18:56:00 +00:00
605249eb61
gcc 4.0 compile fix.
2005-05-29 20:01:48 +00:00
4625628e67
Make some of the OLE interface vtables const.
2005-05-27 20:17:35 +00:00
34fa35dc99
Added rules for building import libraries in the individual dll
...
makefiles, and added support for building a .def.a static import
library too.
2005-05-09 14:42:30 +00:00
d62356aa1e
Added rules to build import libraries in the individual dll makefiles.
...
Generate import libraries with the right name right away instead of
using an intermediate .spec.def file.
2005-05-07 12:39:52 +00:00
c3116c5e61
Renamed ttydrv and x11drv to winetty.drv and winex11.drv respectively
...
to follow the namespace conventions and make it clear that they are
drivers and not dlls.
Moved the graphics driver configuration to HKLM\Software\Wine\Drivers.
2005-05-06 19:38:50 +00:00
4ed37e03c6
Fix crash on drawStridedSlow.
2005-04-27 08:12:23 +00:00
67f2ad4563
- Volume now inherits Resource. This isn't the way Microsoft implements
...
the interface but it is more correct way (Microsoft even have a
resource type of volume).
- Moved usage, format, allocatedMemory and size onto the resource
class structure.
- Refactored Preload for classes that inherit BaseTexture, preload now
binds the texture instead of bind texture calling preload, bindTexture
allocated a glTexture if there isn't one.
- Added two new class static members BaseTexture_CleanUp and
Resource_CleanUp that should be called by classes that implement
BaseTexture or Resource.
2005-03-29 19:01:00 +00:00
9ed61de9a2
Get rid of HeapAlloc casts.
2005-03-24 21:01:35 +00:00
93416cdaf7
Assorted spelling fixes.
2005-03-23 13:15:18 +00:00
d0ee9f9309
Avoid spaces before preprocessor directives, that's not portable.
2005-03-02 12:23:20 +00:00
6bec623edb
Correct handling of unusual vendor strings in d3d8, and check for a
...
stateblock before trying to release it in wined3d.
2005-02-24 10:05:06 +00:00
b10ba61112
Check that pstream is not null.
2005-02-08 12:10:57 +00:00
f777d70a63
Only create an X window for top-level windows, not for child windows.
...
Get rid of the X client window too, it's no longer needed.
2005-01-31 16:34:07 +00:00
7a49e82dac
- use Interlocked* functions in AddRef and Release.
...
- store the result of the Interlocked functions and use only this.
2005-01-24 11:31:45 +00:00
6063b542aa
char -> const char fixes.
2005-01-24 11:29:44 +00:00
41427857b1
Add render target support, and ensure there is a front and back buffer
...
created during device creation.
2005-01-09 17:37:02 +00:00
cf1d00bb08
Removed excessive statement (break after return or goto, not useful
...
break, not needed vars...)
2005-01-09 16:42:53 +00:00
5ad7d858e0
Do not check for non NULL pointer before HeapFree'ing it. It's
...
redundant.
2004-12-23 17:06:43 +00:00
ebe3c529b1
Janitorial: C booleans must not be compared against TRUE.
2004-12-09 14:07:59 +00:00
Henri Verbeet