Henri Verbeet
0048a0373b
d3d10core: Keep a reference to the wined3d device in the d3d10 device.
2009-02-23 12:20:29 +01:00
Henri Verbeet
8cefc47d81
wined3d: Add DXGI formats to WINED3DFORMAT.
2009-02-20 11:10:37 +01:00
Henri Verbeet
d575b5fecb
d3d8: Explicitly convert between D3DFORMAT and WINED3DFORMAT values.
2009-02-20 11:09:54 +01:00
Francois Gouget
1f601015cd
d3d8: Make some device_parent_*() functions static.
2009-01-26 15:13:29 +01:00
Henri Verbeet
b5eaca542e
d3d8: Properly test for dynamic usage in device_parent_CreateSurface().
2009-01-16 13:29:52 +01:00
Henri Verbeet
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
Michael Stefaniuc
357c3f4a2c
d3d8: Remove superfluous pointer casts.
2009-01-14 13:51:01 +01:00
Henri Verbeet
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
Henri Verbeet
007c648c20
d3d: Correct some debug levels.
2008-12-30 11:36:50 +01:00
Henri Verbeet
4adb342327
wined3d: Remove GetFVF() and SetFVF() from IWineD3DDevice.
2008-12-17 14:02:03 +01:00
Henri Verbeet
46572f682c
wined3d: Refuse to create shaders with a NULL function.
2008-12-16 12:51:49 +01:00
Henri Verbeet
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
Henri Verbeet
b9468a89fc
d3d8: Create a d3d8 declaration as parent for FVF based declarations.
2008-12-15 14:00:37 +01:00
Francois Gouget
ec7cbc26f5
d3d8: Make D3D8CB_CreateSurface() static.
2008-12-15 12:25:02 +01:00
Alexandre Julliard
00e0d1510b
d3d8: Make a function static.
2008-12-04 12:46:52 +01:00
Francois Gouget
d3c7b2f7cc
d3d8: Remove WINAPI on static functions where not needed.
2008-11-24 14:18:42 +01:00
Michael Stefaniuc
4f199a10ad
Remove the remaining casts of NULL.
2008-11-03 13:42:09 +01:00
Stefan Dösinger
93af8d3631
d3d: Do not restore the display mode in ddraw.
2008-11-03 13:34:13 +01:00
Henri Verbeet
092b51e82a
wined3d: Rename CreateAdditionalSwapChain to CreateSwapChain.
2008-10-28 12:46:46 +01:00
Henri Verbeet
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
Henri Verbeet
01539fb926
d3d8: GetDepthStencilSurface returns D3DERR_NOTFOUND when no depth stencil is present.
2008-09-10 12:05:10 +02:00
H. Verbeet
898c2c9778
d3d8: Don't store shader_handle's.
...
They're not stable across table resizes.
2008-08-20 10:26:51 +02:00
Stefan Dösinger
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
Tobias Jakobi
9ba3d03e78
d3d8: Fix IDirect3DDevice8::CreateImageSurface pool type.
2008-07-08 21:08:32 +02:00
Andrew Talbot
c8d495bac1
d3d8: Dangling pointers fix.
2008-05-05 19:46:15 +02:00
Stefan Dösinger
0fa0df7843
d3d8: Reject broken normal declaration types with fixed function.
2008-03-28 14:49:30 +01:00
Austin English
4777f26d61
Spelling fixes.
2008-03-27 11:10:07 +01:00
Stefan Dösinger
8869c0f147
d3d: De-pointerize the WINED3DCAPS structure.
2008-03-25 19:36:38 +01:00
Alexandre Julliard
980ee365a0
wined3d: Use unsigned int instead of size_t for element counts.
2008-01-07 17:17:04 +01:00
Gerald Pfeifer
55e92b9410
d3d8: Fix type of loop variable.
2008-01-04 12:12:31 +01:00
Gerald Pfeifer
21a9c2d2f9
wined3d: Removed dead FIXME checks.
2008-01-03 11:53:29 +01:00
Andrew Talbot
70d82dfbd9
d3d8: Remove unneeded casts.
2008-01-02 12:38:41 +01:00
Andrew Talbot
cd2964483a
d3d8: Remove unneeded casts.
2007-12-05 12:04:39 +01:00
Stefan Dösinger
6cecaa9852
d3d8: Release the vertex declarations array when destroying the device.
2007-11-20 12:53:00 +01:00
Stefan Dösinger
6ec6c941fa
wined3d: BaseVertexIndex can be negative.
2007-08-27 12:00:42 +02:00
Stefan Dösinger
a06e002e93
wined3d: Add a wined3d private WINED3DSBT_RECORDED.
2007-08-15 09:36:20 +02:00
Stefan Dösinger
527295e57f
d3d8: Convert fvfs to vertex declarations.
2007-06-21 13:08:57 +02:00
Stefan Dösinger
09aefe2108
d3d8: Hold the lock in IDirect3DDevice8 methods.
2007-06-11 13:54:33 +02:00
H. Verbeet
6ee356fca0
wined3d: Get rid of the pBaseVertexIndex parameter to IWineD3DDeviceImpl_GetIndices, use GetBaseVertexIndex instead.
2007-06-07 11:20:48 +02:00
H. Verbeet
785771272a
wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead.
2007-06-06 12:10:47 +02:00
Stefan Dösinger
94b3fddec8
d3d: Pass the cube face to Create*Texture's surface creation callback.
2007-05-01 11:42:25 +02:00
Stefan Dösinger
725057da47
d3d: Remove dependency on ddraw.h header.
2007-04-16 13:20:15 +02:00
Andrew Talbot
fb367f813a
d3d8: Void functions should not return a value.
2007-04-09 12:15:28 +02:00
Felix Nawothnig
ea0d7f17ca
d3d8: Add missing relay trace.
2007-04-07 11:01:26 +02:00
H. Verbeet
b68c72faef
d3d8: Implement IDirect3DDevice8_GetVertexShaderDeclaration.
2007-03-08 11:58:41 +01:00
H. Verbeet
138826b8cc
d3d8: Save the d3d8 vertex declaration.
2007-03-08 11:58:23 +01:00
Stefan Dösinger
ef68e32b03
wined3d/d3d8: Move todo about sw vp usage to d3d8.
2007-02-20 11:45:56 +01:00
H. Verbeet
a4bc52a89c
wined3d: Fix WINED3DPRESENT_PARAMETERS and use it instead of D3DPRESENT_PARAMETERS.
2007-02-16 12:31:03 +01:00
Stefan Dösinger
d74712690c
d3d8: Set WINED3DPRESENT_PARAMETERS.MultiSampleQuality to a valid pointer.
2007-02-15 17:22:35 +01:00
H. Verbeet
157205c085
d3d8: Don't store the d3d8 declaration in the wined3d object.
2007-02-14 13:56:50 +01:00
H. Verbeet
efed9aea1f
d3d8: Move loading local d3d8 vertex shader constants from wined3d to d3d8.
2007-02-14 13:54:55 +01:00
H. Verbeet
dea795f7ac
d3d9: Don't store the d3d9 declaration in the wined3d object.
2007-02-14 13:54:42 +01:00
H. Verbeet
32e5cac2be
wined3d: Get rid of the vertexDeclaration field in IWineD3DVertexShaderImpl.
2007-02-14 13:54:29 +01:00
H. Verbeet
5ad6766c85
d3d8: Store the d3d8 vertex declaration in the d3d8 vertex shader.
2007-02-14 13:54:17 +01:00
Stefan Dösinger
00aa8ab08c
d3d8: Deleting bound shaders unbinds them.
2007-02-13 12:07:46 +01:00
H. Verbeet
d73e5d6fc8
d3d8: IDirect3DDevice8Impl_GetVertexShaderDeclaration gets passed a handle instead of a pointer.
2007-01-08 11:46:05 +01:00
H. Verbeet
6e3b732ffb
d3d8: IDirect3DDevice8Impl_GetVertexShaderFunction gets passed a handle instead of a pointer.
2007-01-08 11:46:05 +01:00
H. Verbeet
cae630f92e
d3d8: IDirect3DDevice8Impl_GetPixelShaderFunction gets passed a handle instead of a pointer.
2007-01-08 11:46:05 +01:00
Stefan Dösinger
71631f7638
wined3d: Use the baseVertexIndex in the stateblock.
2007-01-03 11:02:51 +01:00
Chris Robinson
b66a52856c
d3d8: Don't report Shader Model 2.0 or higher.
2006-12-29 12:49:41 +01:00
Chris Robinson
b7b9d4e3c7
d3d: GetStreamSource on a stream with NULL data isn't an error.
2006-12-26 12:52:54 +01:00
Markus Amsler
0531858146
d3d8: Handle surface container in d3d8.
2006-12-18 12:07:46 +01:00
Markus Amsler
5e0fc62135
d3d: Callback infrastructure for implicit swap chain destruction in IWineD3DDevice.
2006-12-18 12:07:26 +01:00
Markus Amsler
4745618487
d3d8: Fix implicit surface refcounting.
2006-12-06 12:41:27 +01:00
Markus Amsler
0d725490d6
d3d8: Handle surface refcount forwarding in d3d8.
2006-12-06 12:40:12 +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
44e6c6b67a
d3d8: Use correct COM macros.
2006-12-01 12:27:17 +01:00
Markus Amsler
bd072332e1
Revert "d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.".
...
This reverts commit 167b83c28a
.
2006-11-30 16:04:00 +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
b657cd5f58
Revert "d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.".
...
This reverts commit a7518f6f54
.
2006-11-30 16:04:00 +01:00
Markus Amsler
f5204b8afe
Revert "d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.".
...
This reverts commit 18546a65e6
.
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
3a270375d7
Revert "d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.".
...
This reverts commit 16b1e046d8
.
2006-11-30 16:03:59 +01:00
Markus Amsler
9dd81f64cb
Revert "d3d: Remove AddRef from IWineD3DDevice_GetIndices.".
...
This reverts commit 5c4008719c
.
2006-11-30 16:03:59 +01:00
Markus Amsler
5c4008719c
d3d: Remove AddRef from IWineD3DDevice_GetIndices.
2006-11-22 11:40:43 +01:00
Markus Amsler
16b1e046d8
d3d: Remove AddRef from IWineD3DDevice_GetStreamSource.
2006-11-22 11:40:37 +01:00
Markus Amsler
274df6ef88
d3d: Remove AddRef from IWineD3DDevice_GetTexture.
2006-11-22 11:40:31 +01:00
Markus Amsler
18546a65e6
d3d: Remove AddRef from IWineD3DDevice_GetDepthStencilSurface.
2006-11-22 11:40:24 +01:00
Markus Amsler
a7518f6f54
d3d: Remove AddRef from IWineD3DDevice_GetRenderTarget.
2006-11-22 11:40:05 +01:00
Markus Amsler
478a414e58
d3d: Remove AddRef from IWineD3DDevice_GetBackBuffer.
2006-11-22 11:39:52 +01:00
Markus Amsler
167b83c28a
d3d: Remove AddRef from IWineD3DDevice_GetDirect3D.
2006-11-22 11:39:39 +01:00
Markus Amsler
bef60f1dfc
d3d8: Backport null pointer check in SetCursorProperties.
2006-11-09 12:44:22 +01:00
Andrew Talbot
4471ad44a3
d3d8: Cast-qual warnings fix.
2006-10-27 12:10:04 +02:00
Markus Amsler
dd8682e9c5
d3d8: Fix wrong function name in FIXME.
2006-10-17 11:14:15 +02:00
Stefan Dösinger
1e6a38967c
d3d8: Implement CopyRects with BltFast.
2006-10-16 11:26:00 +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
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
c6e0ca28d5
d3d8: Win64 printf format warning fixes.
2006-10-10 19:58:56 +02:00
Stefan Dösinger
3529560cd7
wined3d: Add WINED3DUSAGE_OVERLAY.
2006-10-06 12:53:24 +02:00
Francois Gouget
3adb46f050
d3d8: Fix '\n' typo.
2006-10-05 17:44:51 +02:00
H. Verbeet
112810a480
d3d8: Free the shader handle table.
2006-09-12 10:52:47 +02:00
H. Verbeet
9a4ce31737
d3d8: Use proper handles for pixel shaders.
2006-08-28 11:49:06 +02:00
H. Verbeet
4a48e38e7d
d3d8: Improve shader handle management.
2006-08-28 11:47:02 +02:00
H. Verbeet
7ac5bd67d5
d3d: Don't crash when SetRenderTarget() is called with a NULL pSurface.
2006-08-07 13:12:37 +02:00
Vitaliy Margolen
145442a79d
d3d8: Fix remaining refcount tests and tighten all tests.
2006-07-07 16:57:41 +02:00
Alexandre Julliard
7bf49faf23
d3d8: Don't use sizeof in traces to avoid printf format warnings.
2006-06-13 14:09:36 +02:00
Alexandre Julliard
c3bd09e563
d3d8: Make the virtual table functions static where possible.
2006-06-10 11:48:24 +02:00
H. Verbeet
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
Stefan Dösinger
1c46c693c7
d3d8: Back buffer count fix.
2006-05-31 11:44:32 +02:00
Jonathan Ernst
360a3f9142
Update the address of the Free Software Foundation.
2006-05-23 14:11:13 +02:00
Vitaliy Margolen
1cc318c5a6
d3d8: All objects created by device should keep reference to it.
2006-05-22 11:29:27 +02:00
Stefan Dösinger
d04f0507cf
wined3d: Implement Init3D and Uninit3D.
2006-04-19 12:43:22 +02:00
Stefan Dösinger
03b256b16d
wined3d: Add a parameter for surface type selection.
2006-04-18 11:09:17 +02:00
Stefan Dösinger
d2510847b0
wined3d: Split device creation and opengl initialization.
2006-04-13 11:22:45 +02:00
Vitaliy Margolen
99136998e2
d3d8: VertexShader should keep reference to the parent device object.
2006-04-12 11:20:07 +02:00
Stefan Dösinger
c289b3cc51
wined3d: Define WINED3DGAMMARAMP based on D3DGAMMARAMP / DDGAMMARAMP.
2006-04-04 20:00:41 +02:00
Stefan Dösinger
08c38a87e1
wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h.
2006-04-04 11:51:37 +02:00
Stefan Dösinger
f6ed704f96
wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS.
2006-04-03 21:35:44 +02:00
Vitaliy Margolen
fc13420770
d3dx: VertexBuffer should keep reference to the parent device object.
2006-04-03 14:14:24 +02:00
Stefan Dösinger
0ad31f819d
wined3d: Add WINED3DBACKBUFFER_TYPE to wined3d_types.h.
2006-04-03 12:17:35 +02:00
Stefan Dösinger
fce54bcc49
wined3d: Add WINED3DDISPLAYMODE to wined3d_types.h.
2006-04-03 12:17:22 +02:00
H. Verbeet
1e421c7da9
d3d8: Add a TRACE for IDirect3DDevice8Impl_CreateVertexBuffer.
2006-03-28 17:52:59 +02:00
Stefan Dösinger
1d47556195
wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.
2006-03-28 17:51:45 +02:00
Stefan Dösinger
d75fd75d48
wined3d: Add WINED3DPOOL to wined3d_types.h.
2006-03-28 17:34:42 +02:00
Stefan Dösinger
b4b295c2a5
wined3d: Add WINED3DMULTISAMPLE_TYPE to wined3d_types.h.
2006-03-27 11:30:49 +02:00
Stefan Dösinger
0f7eb52789
wined3d: Add WINED3DTRIPATCH_INFO to wined3d_types.h.
2006-03-27 11:30:49 +02:00
Stefan Dösinger
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
H. Verbeet
bb370f3582
d3d8: Change the default debug channel to d3d8 for device.c.
2006-03-20 12:09:33 +01:00
H. Verbeet
2940fd9170
d3d8: Downgrade a FIXME to a TRACE in IDirect3DDevice8Impl_SetVertexShader.
2006-03-20 12:09:10 +01:00
H. Verbeet
0ea6686134
d3d8: Fix comparison in IDirect3DDevice8Impl_DeleteVertexShader.
2006-03-20 12:09:00 +01:00
Roderick Colenbrander
bcbf5f397e
d3d8/wined3d: Vertex shader fixes.
2006-03-17 13:11:06 +01:00
Francois Gouget
555a06075f
d3d8: Remove spaces before '\n'.
2006-02-28 12:01:47 +01:00
Roderick Colenbrander
d13469c1d8
d3d8: Moved the remaining code over to WineD3D (based on patches by
...
Oliver Stieber).
2006-02-27 12:20:03 +01:00
Francois Gouget
a323238301
d3d8: Remove spaces before '\n', spelling fix.
2006-02-24 21:07:47 +01:00
Roderick Colenbrander
3da999a1f7
d3d8: Move texturing code over to wined3d (based on Oliver Stieber's work).
2006-02-20 11:11:35 +01:00
Roderick Colenbrander
4e4fc93645
d3d8: Move d3d8 surface over to wined3d (based on the work of Oliver Stieber).
2006-02-14 17:13:19 +01:00
Roderick Colenbrander
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
H. Verbeet
e9c3f601ea
d3d8: Use GL_EXTCALL to call OpenGL extension glPointParameterfvARB.
2006-02-05 12:19:13 +01:00
Vitaly Budovski
d68f7a68c0
d3d8: Fixed point sprite scaling when size < 1.0f.
2006-02-04 17:14:38 +01:00
Vitaly Budovski
ecacc1ebcb
d3d8: Fixed POINTSPRITEENABLE.
2006-02-04 17:14:13 +01:00
Vitaly Budovski
80c82f527f
d3d8: Fixed POINTSCALEENABLE.
2006-02-04 17:13:13 +01:00
H. Verbeet
ac16181790
d3d8: For render states D3DRS_POINTSPRITEENABLE and
...
D3DRS_MULTISAMPLEANTIALIAS, use GL_SUPPORT correctly.
2006-01-23 11:26:25 +01:00
Vitaly Budovski
624efed78e
d3d8: Render state additions.
...
Implemented D3DRS_EDGEANTIALIAS.
Implemented D3DRS_POINTSPRITEENABLE.
Implemented D3DRS_MULTISAMPLEANTIALIAS.
2006-01-17 15:58:43 +01:00
Francois Gouget
0edbaf7e80
Remove spaces before '\n' in traces.
2005-11-10 12:14:56 +00:00
Raphael Junqueira
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
Oliver Stieber
009cc4e403
Release the OpenGL context when the device is released.
2005-10-27 12:08:00 +00:00
Oliver Stieber
9c676e6c19
Changed index and vertex buffer so that internal references are
...
counted separately to external ones.
2005-10-27 10:23:41 +00:00
Oliver Stieber
bda8a5c08a
Allow cube textures to be updated.
2005-10-13 13:44:03 +00:00
Mike McCormack
ebf4e53030
Fix sign warnings.
2005-07-28 10:16:54 +00:00
Stefan Huehner
190e1597ff
Fix some missing-declarations warnings.
2005-07-14 12:19:53 +00:00
Francois Gouget
28dc5a8afc
Assorted spelling fixes.
2005-07-11 10:59:41 +00:00
Dmitry Timoshkov
4625628e67
Make some of the OLE interface vtables const.
2005-05-27 20:17:35 +00:00
Francois Gouget
93416cdaf7
Assorted spelling fixes.
2005-03-23 13:15:18 +00:00
Carlos Lozano
b10ba61112
Check that pstream is not null.
2005-02-08 12:10:57 +00:00
Paul Vriens
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