179cee08b0
d3d8: Fix GetDevice() for surfaces that are part of a texture.
...
If the surface is part of a texture it doesn't keep its own reference to the
device, but instead relies on the reference the texture has. This fixes a
regression introduced by 3cedef2ffe
2009-12-07 14:34:04 +01:00
3cedef2ffe
d3d8: Simplify GetDevice().
...
We already store "parentDevice", so we might as well use it.
2009-12-04 14:34:59 +01:00
8151963f4e
d3d8: Directly store a wined3d stateblock in the stateblock handle.
...
IDirect3DStateBlock8Impl doesn't actually do anything useful.
2009-12-03 12:09:12 +01:00
212ee15bd7
d3d8: Return D3DERR_INVALIDCALL when trying to delete an invalid pixel shader.
...
It appears this is fixed on Vista/Win7 to be consistent with
DeleteVertexShader(). Match the more consistent behaviour of Vista/Win7 and
mark the previous behaviour as broken.
2009-12-01 13:16:18 +01:00
55f3c576d9
wined3d: Remove the effetively unused "state" field from the device.
2009-11-18 11:16:54 +01:00
2ac74fa511
d3d8: Make convert_to_wined3d_declaration() static.
2009-11-17 15:14:55 +01:00
e0525b663e
d3d8: Move D3D8CB_DestroySwapChain() to device.c.
2009-11-17 15:14:54 +01:00
fea466455b
d3d8: Add a separate function for device initialization.
2009-11-17 15:14:54 +01:00
141b995b8f
d3d8/tests: Don't require dynamic usage for textures in the stateblock tests.
...
Not all cards support dynamic usage textures, and we don't actually need it.
2009-11-12 13:13:33 +01:00
d72c9ffbf5
d3d8/tests: Only run the vertex/pixel shader constant apply tests when the implementation supports them.
2009-11-10 13:10:27 +01:00
6bb2d5d242
d3d8: Removed superflous NULL checks (Coverity).
2009-11-09 20:00:04 +01:00
e6dcf31b28
d3d8: Run the visual tests in a window.
2009-11-09 19:59:15 +01:00
18c1d6033a
d3d8: Read the backbuffer in the visual test.
2009-11-09 19:59:07 +01:00
8eef221d20
d3d: Handle the pointsize_min default difference in d3d8.
2009-11-03 21:22:12 +01:00
83bca75707
d3d8: Fix device creation error handling.
2009-11-03 21:22:02 +01:00
63326b1925
wined3d: Add a usage flag for vertex buffer optimization.
2009-11-03 21:21:48 +01:00
90e443758a
wined3d: Add a parameter for SetRenderTarget viewport setup.
2009-11-03 21:21:30 +01:00
bf10dbe8a6
wined3d: Map D3DFMT_D24S8 to WINED3DFMT_D24_UNORM_S8_UINT.
...
The internal order of the depth and stencil bits is unspecified since the
format isn't lockable.
2009-10-30 11:28:52 +01:00
50f5c9253e
d3d8/tests: Properly release the first device in test_depth_stencil_reset().
2009-10-23 12:03:03 +02:00
f8bd01a315
d3d8: Add traces.
2009-10-19 11:45:57 +02:00
ec5c417019
d3d8/tests: Check some more return values (LLVM/Clang).
2009-10-16 13:37:05 +02:00
f4005c371f
d3d8: Get rid of some unused variables in IDirect3DDevice8Impl_CopyRects() (LLVM/Clang).
2009-10-16 13:36:55 +02:00
7189c58f2f
d3d8/tests: Mark a failure of GetLightEnable on Win9x as broken().
2009-10-16 13:36:11 +02:00
e80144c403
d3d: Make EndScene calls hookable.
2009-10-14 12:21:06 +02:00
f54d6c366d
d3d8: Make Direct3DCreate8 hookable.
2009-10-14 12:21:06 +02:00
6bd741e3ce
d3d8: Add some stateblock tests for device resources.
2009-10-13 11:38:28 +02:00
eb9727bbab
d3d8: Cleanup the stateblock test callbacks a bit.
...
This mostly just makes the naming more conistent with what we use in other D3D
code, but also passes the device to the init() and cleanup() callbacks to
allow device resources to be created there. Future tests require this.
2009-10-12 12:35:58 +02:00
1e5c398439
d3d8: Add tests for D3DSBT_PIXELSTATE stateblocks.
2009-10-09 11:50:30 +02:00
aa576b3d35
d3d8: Add tests for D3DSBT_VERTEXSTATE stateblocks.
2009-10-09 11:50:29 +02:00
00e7ec9cd6
d3d8: Add some tests for CreateStateBlock().
2009-10-08 13:53:56 +02:00
a5b2721706
d3d8: Don't test D3DRS_DEBUGMONITORTOKEN in the stateblock tests.
...
It looks like this render state isn't stored in the stateblock but directly in
the device. I doubt a lot of applications depend on that though, so just
disable the test for the moment.
2009-10-08 13:53:34 +02:00
d6f4892722
d3d8: Rename abort_stateblock() to delete_stateblock() in the stateblock tests.
2009-10-07 12:24:25 +02:00
fb5079815d
d3d8: Use separate fields for data to check/apply in the stateblock tests.
2009-10-07 12:24:15 +02:00
17909a0c52
d3d8: Get rid of the unused "return_data_buffer" in the stateblock tests.
2009-10-07 12:24:03 +02:00
6dd6074f60
d3d8: Make the individual stateblock tests responsible for checking data.
2009-10-05 13:46:01 +02:00
d818e4edf6
d3d8: Always pass "struct event_data" to "event_fn" in the stateblock tests.
2009-10-05 13:46:01 +02:00
6792bb8843
d3d8: Don't release the parent device before destroying its children.
2009-09-29 12:05:53 +02:00
47c84f4f7f
wined3d: Use the DXGI naming convention for all formats.
2009-09-25 15:15:44 +02:00
906071aa9f
d3d8: It's not an error to have a NULL texture bound to a stage.
2009-09-25 15:15:00 +02:00
c64da00de7
wined3d: Rename IWineD3DDevice::GetIndices() to IWineD3DDevice::GetIndexBuffer().
2009-09-25 15:14:52 +02:00
60e32659a7
wined3d: Rename IWineD3DDevice::SetIndices() to IWineD3DDevice::SetIndexBuffer().
2009-09-25 15:14:44 +02:00
27723affc9
d3d8: Set the vertex declaration's shader handle in vertexdeclaration_init().
2009-09-25 15:14:09 +02:00
789372afa8
wined3d: Don't free D3D pixel shaders until the wined3d pixel shader is destroyed.
2009-09-24 13:24:53 +02:00
717419da11
d3d8: Add a separate function for pixel shader initialization.
2009-09-24 13:24:47 +02:00
ca05ef5dd0
wined3d: Don't free D3D vertex shaders until the wined3d vertex shader is destroyed.
2009-09-24 13:24:19 +02:00
afed6a3f77
d3d8: Add a separate function for vertex shader initialization.
2009-09-24 13:24:11 +02:00
66a7236590
wined3d: Don't free D3D vertex declarations until the wined3d vertex declaration is destroyed.
2009-09-23 12:36:28 +02:00
b6d422446b
d3d8: Add a separate function for vertex declaration initialization from an FVF.
2009-09-23 12:35:42 +02:00
f394dfc0f8
d3d8: Add a separate function for vertex declaration initialization.
2009-09-23 12:35:08 +02:00
93b0600829
wined3d: Don't free D3D buffers until the wined3d buffer is destroyed.
2009-09-18 08:55:25 -05:00
b1bf50d751
d3d8: Add a separate function for vertex buffer initialization.
2009-09-18 08:55:18 -05:00
0201ddf264
d3d8: Add a separate function for index buffer initialization.
2009-09-18 08:55:11 -05:00
a8e8f763bf
wined3d: Don't free D3D textures until the wined3d texture is destroyed.
2009-09-18 08:54:34 -05:00
76c61cf536
d3d8: Add a separate function for texture initialization.
2009-09-17 10:10:16 -05:00
de3bd86fb6
wined3d: Don't free D3D cube textures until the wined3d cube texture is destroyed.
2009-09-17 10:09:44 -05:00
b5b58e423d
d3d8: Add a separate function for cube texture initialization.
2009-09-17 10:09:33 -05:00
d84e2fa747
d3d8: Mark internal symbols hidden.
2009-09-17 10:09:21 -05:00
a286646f51
wined3d: Don't free D3D volume textures until the wined3d volume texture is destroyed.
2009-09-16 13:06:06 -05:00
eedfc95eef
d3d8: Add a separate function for volume texture initialization.
2009-09-16 13:05:58 -05:00
e9000d2e6c
wined3d: Don't free D3D volumes until the wined3d volume is destroyed.
2009-09-16 13:05:20 -05:00
ff923245e1
d3d8: Add a separate function for volume initialization.
2009-09-16 13:05:06 -05:00
a5214c306f
wined3d: Don't free D3D surfaces until the wined3d surface is destroyed.
...
This prevents for example a d3d9 depth stencil from being destroyed when it
has no external references but is still in use by the device/stateblock. A
nice side effect is that it simplifies handling of "implicit" surfaces like
the frontbuffer and backbuffers, as well as the forwarding of reference counts
for surfaces that are part of a texture.
2009-09-16 13:04:32 -05:00
e02f7b2062
d3d8: Add a separate function for surface initialization.
2009-09-15 14:32:30 -05:00
2b2fc827ce
wined3d: Remove unused parameters to drawPrimitive().
2009-09-11 12:09:14 +02:00
fecbf7b416
d3d8: Remove trailing spaces.
2009-08-31 12:41:21 +02:00
ebe5219c6b
d3d8: Release the lock instead of locking a second time (Smatch).
2009-08-26 12:10:27 +02:00
f9c791f9ca
d3d8: Use a wined3d cs for wined3d locking.
...
We will need this for d3d10, where both dxgi and d3d10core are making wined3d
calls. Right now d3d8/d3d9 also use this to protect their own data, but
eventually we should push this down into wined3d itself and use something a
bit more fine-grained. There's no good reason that doing e.g. a vertex buffer
upload in some thread should block all of wined3d.
2009-08-25 11:12:17 +02:00
4d1379f6a9
d3d8: Remove stray tabs.
2009-08-25 11:09:52 +02:00
6f5a1d9a15
wined3d: Filter WINED3DSTENCILCAPS_TWOSIDED in d3d8.
2009-08-07 14:56:48 +02:00
296573caae
d3d: Filter R8G8B8 in d3d8 and d3d9.
2009-08-07 14:56:40 +02:00
699f68cdee
wined3d: Get rid of some pointers in WINED3DADAPTER_IDENTIFIER.
...
This also avoids some unchecked strcpy() calls.
2009-07-07 11:50:30 +02:00
7d3beb6b79
d3d: Add a test for releasing the device after destroying the window.
2009-06-29 12:30:32 +02:00
f0e8307566
d3d8/tests: Make sure the device is released properly.
2009-06-23 11:48:02 +02:00
a25947fa7e
d3d8: Add WINED3DFMT_W11V11U10 <=> D3DFMT_W11V11U10 conversion.
2009-06-19 13:52:42 +02:00
91e306579b
d3d8/tests: Fix some tests (logical || with non-zero constant).
2009-06-19 13:52:32 +02:00
7dd5cc8749
d3d8: Add tests for deleting invalid shader handles.
2009-06-16 13:36:59 +02:00
1bbc65b155
d3d8: Deleting an invalid pixel shader handle should return D3D_OK.
2009-06-16 13:36:54 +02:00
dc3958c079
d3d8: Do some more verification on handles.
2009-06-16 13:36:48 +02:00
88162fabb8
wined3d: Get rid of the pointers in WINED3DSURFACE_DESC.
2009-06-15 13:42:29 +02:00
4bc6b376e0
wined3d: Remove the useless "resource_type" parameter from IWineD3DDevice::CreateSurface().
2009-06-12 17:33:15 +02:00
621da64245
wined3d: Get rid of the silly pointers in WINED3DVOLUME_DESC.
2009-06-09 17:01:14 +02:00
13a05caa97
wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader().
...
Once upon a time this was used for creating fake vertex shader
attribute semantics for d3d8 shaders. We don't need this anymore since
device_stream_info_from_declaration() will use the vertex
declaration's output slot to load the data, if present. That also
avoids the potentially expensive matching of attribute semantics
between vertex shader and declaration for d3d8.
2009-05-28 12:42:18 +02:00
f0e303b0f2
wined3d: Add the output signature to IWineD3DDevice_CreateVertexShader().
2009-05-26 13:49:55 +02:00
9a579a43b1
wined3d: Use the output signature to map SM4 pixel shader outputs to the appropriate register.
2009-05-11 12:43:00 +02:00
9f1731edb6
d3d: Limit d3d8 and d3d9 vshader constants to 256.
...
DX10 cards support 512(ATI) or 1024(Nvidia) vertex shader constants in
GL. The dx9 DXCapsViewer shows that dx10 windows drivers only claim
256 constants on Windows, so we can and should do the same.
2009-04-27 13:23:36 +02:00
33eb939390
wined3d: SetDepthStencilSurface is always called when AutoDepthStencil is enabled.
2009-04-24 11:51:27 +02:00
6f33b97c94
wined3d: Get rid of the shared_handle parameter.
...
I don't expect us to support this in the near future, and right now it's just
dead code.
2009-04-23 14:22:06 +02:00
458902b5b2
d3d8: Add tests for IDirect3D8Device_Reset.
2009-04-22 12:55:45 +02:00
cb1c9dcda9
d3d: Remove the format from index buffers.
2009-04-09 16:28:25 +02:00
f0efa97413
wined3d: Remove the buffer fvf.
2009-04-09 16:28:10 +02:00
ff16f30677
d3d8: Store the fvf in the d3d8 vertex buffer.
2009-04-09 16:27:43 +02:00
513a493f00
wined3d: Merge IWineD3DIndexBuffer and IWineD3DBuffer.
2009-04-08 11:37:29 +02:00
3ed94329a3
wined3d: Use Map and Unmap for index buffers.
...
Just a change in name to prepare for the next patch
2009-04-08 11:36:18 +02:00
dc80a3ede5
d3d: Unify WINED3DVERTEXBUFFER_DESC and WINED3DINDEXBUFFER_DESC.
2009-04-08 11:36:02 +02:00
bc07ad0579
d3d8, d3d9: Don't rely on the wined3d buffer type.
2009-04-08 11:35:29 +02:00
4434d00f84
wined3d: Unify vertex and texture formats.
...
Some fields should be redundant now, eg. gl_vtx_type and glType. I'll leave
that for a different patch to fix though.
2009-03-27 15:51:25 +01:00
6f206c75ec
wined3d: Don't create an END element for wined3d vertex declarations.
...
Wined3d doesn't need it since it already has the element count.
2009-03-27 15:51:25 +01:00
41ea1e1df7
d3d8: Fix some indentation.
2009-03-26 14:47:21 +01:00
c0cefb3501
d3d8: Cleanup the vertexshader handling code a bit.
2009-03-24 12:56:50 +01:00
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
Henri Verbeet