d9cd05db80
wined3d: Add GetHWND and SetHWND methods to IWineD3DDevice.
2006-04-14 10:52:01 +02:00
5f4b424553
wined3d: Add case 0 to switch statement and fix the fixme.
...
Screwed up a copy/paste from one of my recent patches. This
eliminates the erroneous FIXME for calls to D3DFmtMakeGlCfg() with 0
as the Stencil format. Also, it changes the FIXME to print the
correct variable.
2006-04-13 11:23:50 +02:00
cf27031329
wined3d: Add IWineD3DSurface::Flip.
2006-04-13 11:23:03 +02:00
d2510847b0
wined3d: Split device creation and opengl initialization.
2006-04-13 11:22:45 +02:00
59189ba75b
wined3d: Combined unhandled renderstate cases into one.
2006-04-12 20:57:26 +02:00
c90c04607e
wined3d: IWineD3DDeviceImpl_Reset cleanup.
...
Joined the functions as it looks like a typo in the function name
(IWineD3DDeviceImpl_Rest isn't used anywhere but contains comments).
2006-04-12 20:57:16 +02:00
e0c8773199
wined3d: Add a resource dumper.
2006-04-12 12:54:28 +02:00
c1a6e910ce
wined3d: Enable texld instruction (shaders 1.4).
2006-04-12 11:42:21 +02:00
8ab0237e21
wined3d: Reorganize shaders code a bit.
2006-04-12 11:42:04 +02:00
be10a6a099
wined3d: Spelling fixes and downgrade a FIXME to a TRACE.
2006-04-12 11:17:59 +02:00
108688f96a
wined3d: Don't do a logical AND on the swap effect.
2006-04-12 11:17:49 +02:00
edfe5d68ee
wined3d: Store the private data in IWineD3DResource::SetPrivateData.
2006-04-12 11:17:39 +02:00
12be14b6cc
wined3d: Remove bogus address register warning for pixel shaders.
...
Pixel shaders don't have an address register, this warning is bogus.
D3DSPR_ADDR is interpreted as D3DSPR_TEXTURE for pixel shaders.
2006-04-11 14:22:18 +02:00
3f591ecb13
wined3d: Add some more debugging info.
...
Adds more debugging FIXME's if a specific WINED3DFMT_??? isn't supported.
2006-04-10 16:32:30 +02:00
634698cb19
wined3d: Print all errors in checkGLcall.
2006-04-10 12:24:23 +02:00
88a7c9e948
wined3d: Downgrade some FIXMEs.
2006-04-10 12:23:45 +02:00
5c12c043df
wined3d: Map D3DFMT_L16, D3DFMT_A16B16G16R16 to OpenGL formats.
...
Map:
D3DFMT_L16 -> GL_LUMINANCE16_EXT
D3DFMT_A16B16G16R16 -> GL_RGBA16_EXT
as Raphael suggested.
Also increase the returned Bpp for unknown and unhandled formats from
4 to 8 bytes - this part fixes segfault in the F.E.A.R demo. It now
shows some flashy graphics before it dies again :)
2006-04-10 12:23:38 +02:00
cf4b91f074
wined3d: Add WINED3DBOX to wined3d_types.h.
2006-04-07 14:55:50 +02:00
9d67b4287e
wined3d: Rename return values from D3D* to WINED3D*.
2006-04-07 14:54:04 +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
63fd9a7a98
wined3d: Add WINED3DTEXTUREFILTERTYPE to wined3d_types.h.
2006-04-06 22:22:35 +02:00
d4fa4f22cb
wined3d: CreateDevice should use the root window.
2006-04-04 20:34:47 +02:00
166b6d861d
wined3d: Output unhandled renderstates with debug_d3drenderstate.
2006-04-04 20:31:38 +02:00
10fc948093
wined3d: Add D3DFMT_L16.
2006-04-04 20:30:53 +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
bb704ea951
wined3d: Add a couple more debugging output formats.
2006-04-04 12:08:40 +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
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
a7063774b9
wined3d: Do not set the mipmap level count every time a texture is used.
2006-04-03 11:45:50 +02:00
59af5c4a62
wined3d: Move fields common to vertex shaders and pixel shaders to IWineD3DBaseShader.
2006-03-30 21:55:15 +02:00
6a8578f847
wined3d: Add WINED3DDEVTYPE to wined3d_types.h.
2006-03-30 12:45:57 +02:00
1e1a708e8a
wined3d: Create an IWineD3DBaseShader class.
2006-03-29 13:40:45 +02:00
d4132cf7d7
wined3d: Move the vshader_ins and pshader_ins arrays into their respective objects.
2006-03-29 13:40:16 +02:00
3ee642bb09
wined3d: Move the SHADER_OPCODE definition to wined3d_private.h.
2006-03-29 13:39:33 +02:00
0ac9c473d6
wined3d: Pass the correct number of parameters for texld with ps version >= 2.
2006-03-29 13:38:18 +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
518de008db
wined3d: Move the D3DSIO_DCL dumping code into its own function.
2006-03-24 13:00:38 +01: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
1aca53860a
wined3d: Set vertex attribute pointers defined in vertex declarations properly.
2006-03-22 21:41:05 +01:00
e7b33b0f37
wined3d: Fix slightly misleading ParseVertexDeclarationUsage naming.
2006-03-22 21:40:37 +01:00
f716eea3df
wined3d: Initialise WINED3DVERTEXELEMENT's Reg field in
...
IWineD3DVertexDeclarationImpl_ParseDeclaration9.
2006-03-22 21:40:21 +01:00
46b13aaa58
wined3d: glTypeLookup cleanup.
...
Use a struct instead of an UINT array as entries in the glTypeLookup
table.
2006-03-22 21:39:04 +01:00
bce3da3af7
wined3d: Store the pixelshader version in the pixelshader object.
2006-03-22 21:37:19 +01:00
a187ab05c4
wined3d: Don't use OpenGL 2.0.
2006-03-20 22:09:05 +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
d4836e1ce1
wined3d: Vertexdeclaration fix.
...
In the old d3d8 code SetVertexShader stored the so called vertex
declaration in the stateblock. In case of WineD3D this isn't done
which breaks the drawPrimitive code. This patch stores the vertex
declaration again in the stateblock which fixes Age Of Mythology.
2006-03-13 14:19:10 +01:00
9f46792ba2
wined3d: Add WINED3DVERTEXBUFFER_DESC to wined3d_types.h.
2006-03-13 13:32:01 +01:00
d2ef7869de
wined3d: Don't override variable that still has something we need.
...
Use local temp variable instead.
2006-03-13 13:31:45 +01:00
76e5e88fe7
wined3d: Add D3DSIO_TEXM3x3PAD to opcode list. We already handle it where we should.
2006-03-13 13:31:27 +01:00
913df5b143
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-10 21:43:00 +01:00
76c469e5a4
wined3d: Use OpenGL fragment programs when available.
2006-03-09 13:10:42 +01:00
86b9041c0c
wined3d: Remove an incorrect FIXME.
2006-03-09 13:10:30 +01:00
008c6a00b9
wined3d: Enable color fixups for vertex shaders.
2006-03-09 13:08:55 +01:00
21d62ed1f1
wined3d: Minor vshader_program_add_param cleanup.
...
- In vshader_program_add_param, pass a pointer to the shader object
instead of individual parameters.
- In vshader_program_add_param, rename input to is_input to make it
clearer what the parameter does.
- Fix a typo & cleanup a comment.
2006-03-09 13:08:35 +01:00
6104c67613
wined3d: Use WINED3DPRESENT_PARAMETERS in IWineD3DSwapChain::GetPresentParameters.
2006-03-09 12:51:26 +01:00
851bdfb5e0
wined3d: Add D3DLOCK_* types to wined3d_types.h.
2006-03-08 11:33:35 +01:00
78a43b3dbc
wined3d: Fix a few FIXME's.
2006-03-07 10:56:52 +01:00
ae21e30118
wined3d: Implement GetCreationParameters (from a patch by Al Tobey).
2006-03-07 10:53:43 +01:00
270afeb5e8
wined3d: Define D3D usage flags in wined3d_types.h.
2006-03-07 10:53:02 +01:00
2f0c781988
wined3d: Add device caps to wined3d_types.h.
2006-03-07 10:51:34 +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
fd2739b023
wined3d: Don't call glCompressedTexImage2DARB without allocatedMemory.
...
Don't call glCompressedTexImage2DARB if we haven't got allocatedMemory (yet).
Fix a small typo.
2006-03-06 20:01:05 +01:00
46ecb15c5c
wined3d: Fix retrieval of driver adapter versions.
2006-03-06 11:43:00 +01:00
033769f94d
wined3d: Add d3d7 and d3d8/9 cap flags to wined3d_types.h.
2006-03-06 11:36:28 +01:00
6d30800db6
wined3d: Add a few more WINED3DFMT formats to be recognized.
2006-03-06 11:36:07 +01:00
3832eb7de4
wined3d: Added OpenGL 2.0 function definitions.
2006-03-06 11:12:14 +01:00
e5bad779d6
wined3d: Implemented WINED3DRS_DEPTHBIAS.
2006-03-04 16:20:22 +01:00
196eaa674c
wined3d: Added two sided stencil support to WINED3DRS_STENCILFUNC.
2006-03-04 16:18:39 +01:00
f2f59cae61
wined3d: Added two sided stencil support to WINED3DRS_STENCILFAIL,
...
WINED3DRS_STENCILZFAIL and WINED3DRS_STENCILPASS.
2006-03-04 16:18:18 +01:00
6bf561b7ba
wined3d: Implemented fallback for separate stencil function in WINED3DRS_CCW_STENCILFUNC.
2006-03-04 16:17:32 +01:00
7b55a0cff1
wined3d: Implemented fallback for separate stencil operation in WINED3DRS_CCW_STENCIL*.
2006-03-04 16:15:47 +01:00
858be437c5
wined3d: Fix cut&paste typo.
2006-03-04 16:13:39 +01:00
f8ed06ea3d
wined3d: Opengl 2.x compile fix.
2006-03-02 15:50:16 +01:00
252c4adb96
wined3d: Reverse GL_BGR to GL_RGB for the D3D RGB formats.
...
This fixes texture colours in many D3D games (verified with Age Of Mythology).
2006-03-01 20:05:11 +01:00
63585380a9
wined3d: Implemented WINED3DRS_CCW_STENCIL* render states.
2006-02-28 12:22:16 +01:00
5c8c0059ab
wined3d: Implemented WINED3DRS_SCISSORTESTENABLE.
2006-02-28 12:21:00 +01:00
4b10288b5b
wined3d: Implemented WINED3DRS_SLOPESCALEDEPTHBIAS.
2006-02-28 12:20:01 +01:00
c9a1134ce3
wined3d: Implemented WINED3DRS_ANTIALIASEDLINEENABLE.
2006-02-28 12:19:11 +01:00
64ccecfbab
wined3d: Added D3D9 render states.
2006-02-28 12:14:25 +01:00
c8480e25e7
wined3d: Fixed some typos and prevented divide by 0.
2006-02-28 12:13:59 +01:00
7d97f29c24
wined3d: Don't use GetDevice in IWineD3DSurfaceImpl_GetContainer, as
...
it adds a reference to the device that shouldn't be there.
2006-02-27 12:20:09 +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
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
e64a2fdf9e
wined3d: Set the texture size for d3d8.
2006-02-16 12:10:21 +01:00
46e8d67787
wined3d: Update the glOrtho between 2 rhw draws if the viewport was changed.
2006-02-13 13:25:21 +01:00
7a4b59b0c2
wined3d: Don't keep a reference to the container, as it creates a
...
circular reference.
2006-02-13 13:23:58 +01:00
0ff18f58fa
wined3d: Protect float.h inclusion.
2006-02-13 13:23:42 +01:00
da2d1f883b
wined3d: Make the returned driver version similar to windows.
2006-02-11 12:16:29 +01:00
41e5478cdd
wined3d: Extend debug_d3drenderstate with missing states.
2006-02-11 12:15:31 +01:00
25c885e269
wined3d: Prevent crash in setup_light.
2006-02-11 12:14:19 +01:00
c2fe85e658
wined3d: Release the vertex declaration during stateblock cleanup.
2006-02-10 14:52:27 +01:00
bac34c35aa
wined3d: Release the container during surface / volume cleanup.
2006-02-10 14:52:20 +01:00
c99cab705e
wined3d: Support for WINED3DFMT_A8B8G8R8.
2006-02-09 12:07:40 +01:00
61f8ef7936
wined3d: Better warn/fixme for query handling.
2006-02-09 12:07:30 +01:00
c7b58749a1
wined3d: Added CopyRects method (based on a patch by Oliver Stieber).
2006-02-07 16:51:39 +01:00
ff08986d01
wined3d: Always return the number of elements in the vertex
...
declaration in IWineD3DVertexDeclarationImpl_GetDeclaration9.
2006-02-07 12:26:34 +01:00
1c4a94b0ba
wined3d: Don't set the container to the device for standalone surfaces.
2006-02-07 12:26:26 +01:00
b994d057ac
wined3d/d3d9: Cleanup GetContainer for volumes.
2006-02-07 12:26:10 +01:00
2200f3e2ca
wined3d/d3d9: Cleanup GetContainer for surfaces.
2006-02-07 12:25:59 +01:00
694efd7c6f
wined3d: Texture fixes.
...
Set video memory capabilities, add some checks to SetTexture and
update some comments.
2006-02-06 20:57:42 +01:00
bd8db45e44
wined3d: Update the QueryInterface functions of IWineD3DBase subclasses.
2006-02-06 11:32:41 +01:00
c6515ab307
wined3d: Update refcounts when storing references in IWineD3DStateBlockImpl_Capture.
...
Move TRACEs to the top of their code blocks.
2006-02-06 11:32:13 +01:00
b9193cc93f
wined3d: Release the correct vertexdeclaration in
...
IWineD3DDeviceImpl_SetVertexDeclaration.
2006-02-06 11:31:57 +01:00
fe7f2bad15
wined3d: Also update reference counts when we're recording a stateblock.
2006-02-06 11:31:17 +01:00
e43cfb1a68
wined3d: Fix SetContainer.
...
Add/Release references to the container.
Change the type of the container from IUnknown to IWineD3DBase.
2006-02-06 11:30:48 +01:00
bcfa7dcf7d
wined3d: Downgrade a FIXME to a TRACE.
2006-02-06 11:30:27 +01:00
c72fce011d
wined3d: Use GL_EXTCALL to call OpenGL extension glPointParameterfvARB.
2006-02-05 12:19:22 +01:00
3c17322e75
wined3d: Fixed point sprite scaling when size < 1.0f.
2006-02-04 17:07:36 +01:00
da512ca655
wined3d: Add a break which got lost in the POINTSCALEENABLE fix.
2006-02-03 18:51:30 +01:00
8f3c98fdfd
wined3d: Fixed WINED3DRS_POINTSPRITEENABLE.
2006-02-03 12:37:46 +01:00
dbff6d59e8
wined3d: Corrected implementation of WINED3DRS_POINTSCALEENABLE.
2006-02-03 12:34:44 +01:00
4279bcc5a8
wined3d: Implemented WINED3DRS_EDGEANTIALIAS.
2006-02-03 12:33:26 +01:00
6de3620a9c
wined3d: Implemented WINED3DRS_MULTISAMPLEANTIALIAS.
2006-02-03 12:31:02 +01:00
d599037c4e
wined3d: Added support for ARB_POINT_PARAMETERS.
2006-02-02 13:50:31 +01:00
12805f08aa
wined3d: Fix a few TRACEs in pixelshader.c.
2006-01-20 16:13:57 +01:00
f5c2e85b46
wined3d: Return the correct pixelshader in
...
IWineD3DDeviceImpl_GetPixelShader.
2006-01-20 16:13:12 +01:00
4bd8b60bd3
wined3d: A shader isn't guaranteed to have a vertex declaration, so
...
add a NULL check for that.
2006-01-20 16:13:03 +01:00
b884072687
wined3d: Better version string parsing for VENDOR_NVIDIA in
...
IWineD3DImpl_FillGLCaps.
2006-01-19 12:39:37 +01:00
093a034f7f
wined3d: In IWineD3DImpl_FillGLCaps use glGetString instead of
...
glXGetClientString to retrieve the OpenGL vendor.
2006-01-19 11:55:34 +01:00
6526c3772d
Add trailing '\n's to ok() calls.
...
Remove spaces before '\n' in traces.
2006-01-03 12:10:37 +01:00
ee5d72b136
wined3d: Added support for WINED3DFMT_X4R4G4B4.
2005-12-31 13:13:34 +01:00
4e7b2557b5
wined3d: Cleanup shader constants code a little bit.
...
Improved bounds checking.
2005-12-20 11:46:52 +01:00
a57790f46a
wined3d: Vertex declaration cleanup.
...
Clean up constants and the wine declaration when the vertex
declaration is destroyed.
2005-12-16 12:49:38 +01:00
8ff9a7eb55
wined3d: Allow NULL multi sample quality.
...
Allow MultiSampleQuality to be passed as NULL, this is a
requirement for DirectX 8 and lower.
2005-12-16 12:49:22 +01:00
3e495fe465
wined3d: Fix matrix copy/paste bug.
2005-12-16 12:39:07 +01:00
74e28a354f
wined3d: Vertex declaration recording state.
...
Stop SetVertexDeclaration from reference counting if a stateblock is
being recorded.
2005-12-16 12:38:24 +01:00
e76969b0d6
wined3d: Internal reference counting.
...
Change most references to resources parent into references to the
resource, so that external reference counts match DirectX but object
aren't released if they are still referenced by the stateblock.
2005-12-15 10:25:47 +01:00
0f43cb2f38
wined3d: Return the correct parent in IWineD3DVertexDeclarationImpl_GetParent.
2005-12-14 11:29:17 +01:00
dabcbe83e7
wined3d: Return the correct vertex declaration.
...
In IWineD3DDeviceImpl_GetVertexDeclaration, return the vertex
declaration in This->stateblock instead of the one in
This->updateStateBlock.
2005-12-14 10:50:27 +01:00
6077c63feb
wined3d: Don't change the shader's refcount in SetVertexShader and
...
SetPixelShader.
2005-12-13 11:11:01 +01:00
ea942e1e75
wined3d: Cube texture named constants.
...
Update cubetexture so that names constants instead of numeric
constants are used for the facetype and also add some additional
checks where facetype is passed as a parameter to the function.
2005-12-13 11:10:20 +01:00
7c482cb9a1
wined3d: Vertex shader 8 support.
...
Start to add support for DirectX 8 vertex shaders, constants and
registers are now correctly assigned and loaded allowing support for
most basic d3d8 shaders.
2005-12-09 11:23:52 +01:00
c73679e4eb
wined3d: Set pixel shader version correctly in IWineD3DPixelShaderImpl_SetFunction.
2005-12-03 18:18:58 +01:00
246b07de7c
wined3d: Return the correct parent in IWineD3DPixelShaderImpl_GetParent.
...
Remove an unnecessary cast.
2005-12-03 18:10:56 +01:00
4880c586d8
wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and
...
already recording.
2005-12-03 18:04:26 +01:00
5127dc9f49
Assorted spelling fixes.
2005-12-02 16:15:09 +01:00
fbfb971646
Added more Nvidia card IDs.
2005-11-30 19:45:45 +01:00
0e68b671f4
Add support for Intel drivers version string.
...
Update default driver version (nvidia).
2005-11-30 12:02:45 +01:00
aa9ce3577a
Added support for vertex and pixel shader constants that have no type
...
i.e. they haven't been set yet or are clear.
2005-11-29 17:05:54 +01:00
5903c5df1b
Stop reporting not having swapchain 0 as an error and add an internal
...
variable instead of modifying a parameter.
2005-11-28 10:59:41 +01:00
c622cd7c24
Correct some errors in the way vertex declarations for directx 8 are
...
parsed and add offset support.
2005-11-28 10:59:22 +01:00
Stefan Dösinger