a27ee75ed2
wined3d: Remove COM from the buffer implementation.
2011-03-04 16:25:58 +01:00
b7c427b483
ddraw: Just pass NULL as index buffer parent.
...
Since the parent is just an opaque pointer instead of a COM object now, it can
just be NULL instead of needing IParent hacks.
2011-03-04 16:25:58 +01:00
36d4268e3c
wined3d: Remove COM from IWineD3D.
2011-02-02 12:22:42 +01:00
4b109ff1f8
wined3d: Remove COM from the stateblock.
2011-01-31 12:24:58 +01:00
4a2ac6c8bd
ddraw: Drop "Thunk_" from the names of the IDirect3DDevice3 methods.
2011-01-20 12:22:16 +01:00
120678c261
ddraw: Drop "Thunk_" from the names of the IDirect3DDevice2 methods.
2011-01-20 12:22:10 +01:00
f4acb9bb53
ddraw: Drop "Thunk_" from the names of the IDirect3DDevice methods.
2011-01-20 12:22:04 +01:00
9745108096
ddraw: COM cleanup for the IDirectDraw7 iface.
2011-01-19 12:32:06 +01:00
cd8c18e83c
ddraw: COM cleanup for the IDirectDraw4 iface.
2011-01-19 12:32:00 +01:00
4202f09100
ddraw: COM cleanup for the IDirectDraw2 iface.
2011-01-19 12:31:45 +01:00
a59347fcd2
ddraw: COM cleanup for the IDirectDraw iface.
2011-01-19 12:31:12 +01:00
497944f2bd
ddraw: COM cleanup for the IDirect3D7 iface.
2011-01-19 12:31:04 +01:00
97f9b02a26
ddraw: COM cleanup for the IDirect3D3 iface.
2011-01-19 12:30:58 +01:00
2b80213578
ddraw: COM cleanup for the IDirect3D2 iface.
2011-01-18 13:29:59 +01:00
8255d464db
ddraw: COM cleanup for the IDirect3D iface.
2011-01-18 13:29:58 +01:00
b3ced2fa8a
ddraw: Avoid some unsafe IDirect3D7 iface to IDirectDrawImpl transitions.
2011-01-18 13:29:57 +01:00
f8690a6bda
ddraw: Remove a useless function.
2010-10-21 16:18:05 +02:00
70f4e66f84
wined3d: IWineD3DBuffer_Unmap() can't fail.
2010-10-15 16:19:54 +02:00
7cfaf611d0
ddraw: Don't try to enumerate WINED3DFMT_R8G8B8A8_SNORM.
...
There is no ddraw equivalent for this format, as ddraw only supports 2
bump channels. Trying to enumerate this format will only lead to a
confusing (but correct) ERR message
2010-10-06 16:12:02 +02:00
5fa84c56c3
ddraw: Remove another hack.
...
It breaks actual front buffer / back buffer flips.
2010-10-05 15:16:52 +02:00
e6d52c0c8b
wined3d: Add argument check for Type to Get/SetTextureStageState().
2010-09-14 13:32:00 -05:00
fd7c1cbf05
wined3d: IWineD3DBuffer_GetDesc() should never fail.
2010-09-14 09:43:22 -05:00
b1a385db11
ddraw: Remove some stray tabs.
2010-09-08 13:32:00 +02:00
83ff5b5041
ddraw: Handle D3DRENDERSTATE_TEXTUREHANDLE and D3DRENDERSTATE_TEXTUREMAPBLEND in d3d7.
2010-09-03 11:05:35 +02:00
6c4c351791
wined3d: Don't require wined3d object parents to be COM objects.
2010-09-01 14:01:02 +02:00
4005eb2a18
wined3d: Get rid of WINED3DRECT.
2010-08-31 14:23:47 +02:00
cc5271d1b7
wined3d: Rename WINED3DFORMAT to wined3d_format_id.
2010-08-24 12:25:01 +02:00
c3cdebcf44
ddraw: Make some lookup tables const.
2010-08-23 12:04:31 +02:00
20a42b4c98
ddraw: Add / improve TRACEs.
2010-08-20 13:21:24 +02:00
584cb331a9
ddraw: Add a separate function for execute buffer initialization.
2010-08-20 13:21:22 +02:00
a60c493986
ddraw: Add a separate function for device initialization.
2010-08-20 13:21:21 +02:00
c5a14085d4
ddraw: Remove unused / redundant includes.
2010-08-19 11:17:41 +02:00
fee9c1f2b5
ddraw: Remove a useless viewport callback.
2010-08-18 09:41:01 +02:00
14399f6130
ddraw: Remove a useless material callback.
2010-08-18 09:40:55 +02:00
3ad82a82bb
wined3d: The stateblock doesn't have a parent.
2010-07-30 11:36:03 +02:00
51a315386e
ddraw: Use a less offensive handle table implementation for surfaces.
2010-07-30 11:36:03 +02:00
91193b6eec
ddraw: Use a less offensive handle table implementation for stateblocks.
2010-07-30 11:36:02 +02:00
941aeade01
ddraw: Use a less offensive handle table implementation for matrices.
2010-07-29 17:33:36 +02:00
0cb4de4542
ddraw: Use a less offensive handle table implementation for materials.
2010-07-29 17:33:35 +02:00
6fb9ee0ee7
ddraw: Merge the ddraw thunks into ddraw.c.
...
Note how both ddraw 1 and ddraw 7 used the same IDirectDrawImpl_XXX naming
convention.
2010-07-20 13:13:04 +02:00
f18cb4c2f4
ddraw: Grow index buffer as needed.
2010-06-30 16:19:13 +02:00
f97a9e3c0f
ddraw: Fix and clarify texture filter state mappings.
2010-04-06 11:48:59 +02:00
1289842da3
wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw.
2010-04-02 10:36:06 +02:00
2e5976a8c5
wined3d: Move handling of the unimplemented WINED3DRS_BORDERCOLOR state to ddraw.
2010-04-02 10:35:54 +02:00
720aa5bf23
ddraw: Fix D3DTBLEND_MODULATE emulation.
...
Alpha source should be selected with WINED3DTSS_ALPHAOP and not by changing the source itself.
2010-02-15 12:51:09 +01:00
90e443758a
wined3d: Add a parameter for SetRenderTarget viewport setup.
2009-11-03 21:21:30 +01:00
e80144c403
d3d: Make EndScene calls hookable.
2009-10-14 12:21:06 +02:00
47c84f4f7f
wined3d: Use the DXGI naming convention for all formats.
2009-09-25 15:15:44 +02:00
60e32659a7
wined3d: Rename IWineD3DDevice::SetIndices() to IWineD3DDevice::SetIndexBuffer().
2009-09-25 15:14:44 +02:00
2b2fc827ce
wined3d: Remove unused parameters to drawPrimitive().
2009-09-11 12:09:14 +02:00
ee60e5fd71
ddraw: Remove trailing spaces.
2009-09-01 14:06:03 +02:00
7165bd19c1
wined3d: WINED3DTEXF_NONE only makes sense as a mip filter.
2009-08-05 11:20:43 +02:00
99139d9671
ddraw: Constify some variables.
2009-07-24 11:44:17 +02:00
d1e5b3bf62
ddraw: Fix two bounds checks.
2009-06-22 11:44:19 +02:00
88162fabb8
wined3d: Get rid of the pointers in WINED3DSURFACE_DESC.
2009-06-15 13:42:29 +02:00
8681d49030
ddraw: Remove useless comments.
2009-04-21 16:30:04 +02:00
cb1c9dcda9
d3d: Remove the format from index buffers.
2009-04-09 16:28:25 +02:00
fd9b574e4e
ddraw: Store the fvf in the ddraw buffer.
...
WineD3D buffer FVFs will go away soon.
2009-04-09 16:27:35 +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
4194d8040f
ddraw: Filter invalid texture stage states passed by the application.
2009-04-01 14:23:38 +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
d7c7c76850
wined3d: Use separate structures for ddraw style strided data and wined3d's internal stream info.
2009-03-27 15:51:25 +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
22bfd1396c
ddraw: Implement ComputeSphereVisibility.
2009-02-26 15:13:25 +01:00
8cefc47d81
wined3d: Add DXGI formats to WINED3DFORMAT.
2009-02-20 11:10:37 +01:00
f879176b99
ddraw: Use ddraw_from_d3d7 to make a (IDirectDrawImpl *) from a (IDirect3D7 *).
2009-02-10 12:31:50 +01:00
9b5f3ed8f3
ddraw: Rename the main vtables to lpVtbl.
2009-01-22 15:28:22 +01:00
b09b0fbf95
ddraw: Get rid of ddcomimpl.h.
2009-01-22 12:05:14 +01:00
802f9c7e29
ddraw: Get rid of ICOM_OBJECT.
2009-01-22 12:05:07 +01:00
8c4cc2af46
ddraw: Get rid of ICOM_THIS_FROM.
2009-01-22 12:05:03 +01:00
9a0c885e63
ddraw: Get rid of ICOM_INTERFACE.
2009-01-21 11:17:25 +01:00
ad171b143f
ddraw: Get rid of ICOM_INIT_INTERFACE.
2009-01-21 11:16:51 +01:00
ba771f0fac
ddraw: Fix Thunk_IDirect3DDeviceImpl_2_GetCurrentViewport().
2009-01-20 12:34:20 +01:00
5ee7a104c9
ddraw: Remove superfluous pointer casts.
2009-01-14 12:21:02 +01:00
149259d49f
ddraw: Fix an uninitialized variable warning on non-i386.
2009-01-08 17:30:22 +01:00
cc447eac55
wined3d: Move position_transformed out of u.s in struct WineDirect3DVertexStridedData.
2009-01-08 13:21:31 +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
c51bc826e8
ddraw: Properly handle sampler states.
2009-01-06 12:45:20 +01:00
e1ced22db1
ddraw: Convert source files to utf-8.
2008-10-18 19:19:45 +02:00
8299df900c
ddraw: Remove a few more redundant inits (LLVM/Clang).
2008-10-10 12:27:28 +02:00
a697d99d66
ddraw: Sign-compare warnings fix.
2008-09-29 17:32:17 -05:00
ddec94bf0f
ddraw: Pass proper parameters to CheckDeviceFormat.
2008-09-02 14:56:45 +02:00
d5f05c59c7
ddraw: Beware of the surface type when checking for format support.
2008-09-02 14:56:26 +02:00
bb67a925d6
ddraw: Only ddraw checks wether one can give a null pointer to SetMaterial.
2008-08-22 11:32:09 +02:00
69797d7f3d
ddraw: Fix typo in copy_mipmap_chain.
2008-07-28 14:25:09 +02:00
e2ff077697
ddraw: Improve IDirect3DDevice7_Load implementation.
...
Copies palette and colorkey earlier in the helper function, before
copying image, also skips UpdateSurface when palette is missing. This
prevents unnecessary surface (re)loads in wined3d, and gets rid of
some wined3d palette error messages in Sacrifice.
2008-07-22 15:20:33 +02:00
cb5e06c944
ddraw: Implement FPU mode fixup in d3d7 device.
...
As documented in DirectX7 SDK, d3d7 devices set FPU mode (control word) on every
call and restore it back to original state before returning, if created in
DDSCL_FPUPRESERVE cooperative mode. This allows games to work with FPU in a
possibly incompatible mode and avoid resetting it all the time.
2008-06-23 19:59:33 +02:00
17dacf90b2
ddraw: Fix some code unprotected by ddraw lock.
2008-05-12 19:41:46 +02:00
42a61d7ed7
Assorted spelling fixes.
2008-05-06 16:10:20 +02:00
7e8be9ecc0
ddraw: Add full implementation of IDirect3DDevice7_Load.
2008-05-06 11:26:10 +02:00
30221f7bcd
ddraw: Fix some texture blending modes.
2008-05-05 19:55:30 +02:00
8f72961e50
ddraw: Move handling of D3DRENDERSTATE_TEXTUREMAPBLEND from d3ddevice2 to d3ddevice3.
2008-05-05 19:55:13 +02:00
edaaf63bd6
ddraw: Move handling of D3DRENDERSTATE_TEXTUREHANDLE from d3ddevice7 to d3ddevice3.
...
As supported by tests, there is no reason for this state to be handled by
d3ddevice7, and moving it to d3ddevice3 prepares for the changes in next patch
(setting TEXTUREHANDLE state can then go through SetTexture of d3ddevice3).
2008-05-05 19:55:05 +02:00
3e237c6199
ddraw: Set active_device in AddViewport.
2008-04-11 13:04:26 +02:00
6a48e405db
ddraw: Add possibility to ignore lights in viewport_activate.
...
Mostly NOP regarding existing functionality, but makes it possible to skip light
activation when it's not needed (like when clearing).
2008-04-11 13:04:19 +02:00
825baa23a2
ddraw: Spelling fixes.
2008-04-03 11:39:45 +02:00
4188af790a
ddraw: Fix diffuse and specular color types.
2008-03-06 12:46:46 +01:00
069b9c8c1c
ddraw: Catch No-op SetRenderTarget operations.
2008-03-03 20:45:54 +01:00
6810ebb4c1
ddraw: Fix handling of alpha with D3DTBLEND_MODULATE.
2008-01-22 11:19:18 +01:00
44b52b128c
Assorted spelling fixes.
2008-01-16 12:48:29 +01:00
f074c0e162
ddraw: Remove unneeded casts.
2008-01-02 12:38:41 +01:00
4051a09eb2
ddraw: Fix wrong initialization order in IDirect3DDevice vtable.
2007-12-08 19:54:51 +01:00
1f73a97a5a
ddraw: Remove unneeded casts.
2007-12-06 12:07:41 +01:00
a06e002e93
wined3d: Add a wined3d private WINED3DSBT_RECORDED.
2007-08-15 09:36:20 +02:00
89dccc7c7c
ddraw: Implement IDirect3DDevice7::DrawIndexedPrimitiveStrided.
2007-08-08 15:32:00 +02:00
f7597dee15
ddraw: Update the wined3d matrix if a current matrix handle is modified.
2007-07-06 19:29:39 +02:00
c0cc4d4219
ddraw: Fix an incorrect iface->impl cast.
2007-07-05 19:50:32 +02:00
785771272a
wined3d: Get rid of the BaseVertexIndex parameter to IWineD3DDeviceImpl_SetIndices, use SetBaseVertexIndex instead.
2007-06-06 12:10:47 +02:00
d5d7d4dae4
ddraw: Hold the lock in IDirect3DDevice methods.
2007-06-04 12:52:40 +02:00
28170f0474
wined3d: Implement environment bump mapping with GL_ATI_envmap_bumpmap.
2007-05-09 12:07:32 +02:00
9b867f4d91
ddraw: Forward the mag filter correctly to wined3d.
...
Fixes the erros when using anisotropic mag filtering in the d3d7
filter demo.
2007-05-08 18:28:29 +02:00
742260d418
ddraw: Adjust the d3d viewport when changing the back buffer.
...
WineD3D sets up the viewport according to the front buffer, so this
needs to be changed to the values of the render target passed when the
d3d7 device is created and this device turns out not to be the known
front or back buffer.
2007-05-07 21:42:59 +02:00
6acc0a151d
ddraw: Forward all 4 world matrices to wined3d.
2007-05-03 14:24:26 +02:00
ffae39c3f3
ddraw: Update the wined3d depth stencil on device creation, render.
2007-05-01 11:42:25 +02:00
7ca369d9b6
ddraw: Store a WineD3DBaseTexture instead of a WineD3DTexture.
2007-05-01 11:42:24 +02:00
0629946e65
ddraw: Exclude unused headers.
2007-05-01 11:42:24 +02:00
9e3e799ca3
ddraw: Complex surfaces form a tree.
2007-04-30 12:22:06 +02:00
0386eed91f
ddraw: Get rid of FVFs.
...
Remove all IWineD3DDevice::SetFVF calls and instead create converted
vertex declarations and use them. The idea is to remove the FVF paths
from wined3d to simplify the code, and optimize the vertex declaration
codepath.
2007-04-26 14:54:17 +02:00
1d4a4b75bc
ddraw: When changing the back buffers also update the render target.
2007-03-29 21:00:25 +02:00
8f14d4639d
wined3d: Fix struct size calculation in EnumTextureFormats.
2007-03-19 12:23:29 +01:00
efc03f0a34
wined3d: Index buffer fixes.
2007-02-21 10:57:08 +01:00
3b3e865366
ddraw: Handle mipmapped mag filters by ignoring the mipmap parameter.
2007-02-15 16:55:52 +01:00
c3d3dcec81
ddraw: Handle mipmapped TEXTUREMIN render states.
2007-02-15 16:55:45 +01:00
7c40f9aaa2
ddraw: Forward D3DRS_TEXTUREADDRESS* and D3DTSS_ADDRESS* to sampler states.
2007-02-15 16:55:33 +01:00
67b1f4a7e9
wined3d: BeginScene and EndScene tests and fixes.
2007-02-12 12:08:34 +01:00
1d3abdeeaa
wined3d: Store the stream number in the strided structure.
2007-01-17 11:23:54 +01:00
3d14118fb7
ddraw: Get some texture stage states from their equivalent sampler states.
2007-01-10 22:01:31 +01:00
3581d8e8d8
wined3d: Do not keep internal references on vertex buffers.
2007-01-08 20:59:06 +01:00
71631f7638
wined3d: Use the baseVertexIndex in the stateblock.
2007-01-03 11:02:51 +01:00
b1cc8bec82
ddraw: Fix the AddViewport thunk.
2007-01-03 11:01:12 +01:00
e2881758a1
ddraw: Call wined3d's SetTextureStageState not the one of d3d7.
2006-12-01 12:27:04 +01:00
5bec2f57a1
Revert "d3d: Remove AddRef from IWineD3DDevice_GetTexture.".
...
This reverts commit 274df6ef88
2006-11-30 16:04:00 +01:00
274df6ef88
d3d: Remove AddRef from IWineD3DDevice_GetTexture.
2006-11-22 11:40:31 +01:00
30e44c85c8
Assorted spelling fixes.
2006-11-07 15:25:24 +01:00
3bc442dc8c
ddraw: Add missing dereference operators.
2006-10-26 13:04:52 +02:00
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
116236f18c
ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTURE[MIN/MAG].
2006-10-16 17:05:36 +02:00
1d65ade5fa
ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREADDRESS[U/V].
2006-10-16 17:05:31 +02:00
e92d7cbf2b
ddraw: Implement GetRenderState for D3DRENDERSTATE_TEXTUREHANDLE.
2006-10-16 12:12:58 +02:00
1c86290bd5
ddraw: Use real handles for state blocks.
2006-10-16 12:07:30 +02:00
c912032aa5
wined3d: Add D3DTEXTUREOP to the WINED3D namespace.
2006-10-13 11:13:02 +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
ec782c2b97
wined3d: D3DTRANSFORMSTATETYPE: Consistently use in the WINED3D namespace.
2006-10-12 12:33:39 +02:00
b1a4bd87a9
wined3d: D3DRENDERSTATETYPE: Consistently use in the WINED3D namespace.
2006-10-12 12:33:24 +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
2465fcb368
ddraw: Win64 printf format warning fixes.
2006-10-11 12:08:28 +02:00
1a922b6a38
ddraw: Set lplpDirect3DViewport3 to NULL before returning an error (found by Smatch).
2006-10-06 15:20:46 +02:00
82babbee0b
Add missing '\n's to Wine traces.
2006-10-05 17:46:48 +02:00
de5a2f3fbe
ddraw: Implement D3DRENDERSTATE_TEXTUREMAPBLEND.
2006-08-09 20:35:24 +02:00
bffe5a6922
ddraw/wined3d: Remove texture format enumeration functions.
2006-07-18 11:25:22 +02:00
85aa8ab855
wined3d: Add position_transformed flag to Strided data format.
2006-07-07 17:35:36 +02:00
b0c7bee2ef
ddraw: Fix some material related bugs.
2006-06-30 20:42:27 +02:00
44ace22445
ddraw: Matrix values in the execute buffer are handles.
2006-06-30 20:42:13 +02:00
53fc3f6acc
ddraw: Fix some compiler warnings.
2006-06-27 11:14:20 +02:00
9bfbfcbeb4
Assorted spelling, case and grammar fixes.
2006-06-26 13:06:11 +02:00
d50ff220d0
ddraw: Use the handle infrastructure for Matrix handles.
2006-06-22 12:04:26 +02:00
1e2413f4f4
ddraw: Implement proper handle management.
2006-06-19 11:14:18 +02:00
c8901d6f62
ddraw: Rewrite most of ddraw using WineD3D.
2006-06-15 16:51:16 +02:00
Henri Verbeet