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
0ff18f58fa
wined3d: Protect float.h inclusion.
2006-02-13 13:23:42 +01:00
25c885e269
wined3d: Prevent crash in setup_light.
2006-02-11 12:14:19 +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
1c4a94b0ba
wined3d: Don't set the container to the device for standalone surfaces.
2006-02-07 12:26:26 +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
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
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
f5c2e85b46
wined3d: Return the correct pixelshader in
...
IWineD3DDeviceImpl_GetPixelShader.
2006-01-20 16:13:12 +01:00
4e7b2557b5
wined3d: Cleanup shader constants code a little bit.
...
Improved bounds checking.
2005-12-20 11:46:52 +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
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
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
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
4880c586d8
wined3d: return D3DERR_INVALIDCALL when calling BeginStateBlock and
...
already recording.
2005-12-03 18:04:26 +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
6d442aeb34
Assorted spelling fixes.
2005-11-23 20:14:43 +01:00
932815d6f0
Implement a pixel shader parser and cross compiler. All version of
...
shaders up to 3 should be parsed correctly, but only shaders 1-1.4
will be cross compiled.
2005-11-21 16:27:55 +00:00
bcb4201130
Disable support for creation FMT_Unknown textures. This gets most of
...
the d3d8 demos from www.codesampler.com working.
2005-11-17 11:40:43 +00:00
705aec5a6f
- 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-15 12:03:13 +00:00
a8d9a2a4ac
Fix an intermittent lockup with ATI's driver, I expect the problem is
...
trying to clear the display before it's visible. Also correct the
clear alpha value.
2005-11-14 12:28:59 +00:00
0edbaf7e80
Remove spaces before '\n' in traces.
2005-11-10 12:14:56 +00:00
39d6e30db0
Prevent SetFVF from clearing down the vertex declaration of the FVF is
...
zero. This is required for Prince of Persia, The sands of time.
2005-11-07 11:12:38 +00:00
0e3a3555e9
Tidy up UpdateTexture and add support for updating cube textures.
2005-11-04 12:39:17 +00:00
f52f6ce93d
Add support for updating to D3DFMT_UNKNOWN surfaces and tidy up update
...
surface a little.
2005-11-04 11:13:45 +00:00
d6fcc69ddb
Implement D3DFMT_UNKNOWN surfaces, this seems to be used a lot in d3d8
...
but I haven't found any d3d9 application that uses D3DFMT_UNKNOWN
surfaces yet.
2005-11-02 20:01:54 +00:00
1f2a9e2c31
Move the softwareVertexProcessing flag from the stateblock to the
...
device because its state shouldn't be recorded in a stateblock.
2005-10-29 10:30:36 +00:00
5eae622f44
Don't define some functions/variables if they won't be used after in
...
wined3d.
2005-09-29 10:47:59 +00:00
b3563daca2
Implement state tracking for pixel shader constants.
2005-09-28 10:13:00 +00:00
a8c7284f92
Assorted spelling fixes.
2005-09-26 10:58:41 +00:00
9e6957bbdc
Optionally repack nonpower 2 textures to the expected span length when
...
a textures is locked. This is necessary for buggy games like Warhammer
40k that don't work with the odd span sizes produce by default
nonpower 2 support.
2005-09-23 11:08:03 +00:00
357a484a7e
Enable dxt2 and dxt4 compressed textures to be created via
...
Device_CreateSurface.
2005-09-23 10:48:01 +00:00
0fac2d96fc
Clean up all the objects bound to the device when the device is
...
destroyed as a result of its ref count reaching zero.
2005-09-23 10:07:46 +00:00
0ec0f048e6
Removed unused debug channels.
2005-09-22 10:44:40 +00:00
329d017db3
Start to implement TestCooperativeLevel.
2005-09-21 10:55:03 +00:00
0c2fcf2efe
Added support for state management of vertex shader constants via
...
stateblocks.
2005-09-21 10:19:29 +00:00
5ea96a851f
Implemented occlusion queries using either GL_ARB_occlusion_query or
...
GL_NV_occlusion_query.
2005-09-21 09:43:13 +00:00
7df17cecce
Stop vertex shader constants from being set at the same time as the
...
vertex shader when a stateblock is applied.
2005-09-19 14:30:34 +00:00
f7413fd63f
Implemented point sprites using ARB_POINT_SPRITE extension.
2005-09-03 09:36:48 +00:00
55124ec05e
Added the tracking of stream frequency and flags. Stream flags and
...
frequency aren't handled at the moment.
2005-09-02 11:17:17 +00:00
33b2c1fd3c
Added support for DXT2 and DXT4.
2005-08-29 12:20:02 +00:00
f1a2ee521d
Implemented IWineD3DDevice_GetRenderTargetData.
2005-08-29 10:15:47 +00:00
42eff0f92b
Moved GetRasterStatus from device to swapchain.
2005-08-27 09:58:53 +00:00
2af36c646e
Implemented stubbed out pixel shaders and their states in wined3d.
2005-08-25 19:24:21 +00:00
3f24b9164d
Fix quite a few texturing problems and cases where text isn't being
...
correctly displated.
2005-08-22 10:07:10 +00:00
45033446bb
Tidy up some formatting, improve error handling and error logging and
...
fix a couple of spelling mistakes.
2005-08-22 09:13:49 +00:00
1be54d8b79
Integrate hardware vertex shaders into the drawing pipeline.
2005-08-19 10:05:00 +00:00
2c0e97e641
Copy the parser and cross compiler from d3d8 and update everything to
...
vertex shaders 3.0.
The Parser will now display the input shader in DirectX style, and the
cross compiler now generates valid ARB_VERTEX_PROGRAM programs and
outputs the result in ARB_VERTEX_PROGRAM style.
Support for a number of extended attributes has been added, but this
may not be complete, and dereferencing from loop counters isn't
properly parsed yet.
2005-08-17 11:34:03 +00:00
9b0b803b47
Add support for vertex shader constants to the stateblock.
2005-08-17 10:27:01 +00:00
bcd56fe0e5
Assorted spelling fixes.
2005-08-12 18:22:06 +00:00
2e851544dd
Allow the palette to be set and retrieved.
2005-08-11 10:57:20 +00:00
313b01073c
Track the state of softwareVertexProcessing.
2005-08-11 10:31:40 +00:00
e31bc6cea4
Moved support for non power 2 texture to hardware.
...
Fix for the texture state separation patches, ApplyTextureStates is
now called instead of being commented out.
2005-08-03 19:49:05 +00:00
bb6f9b022b
Move the setting of states from device to basetexture, states that
...
relate to the opengl texture object will only be updated when they are
out of sync, this reduces the number of texture object state changes
during game play in Axis and allies from several hundreds to 0 or 1.
2005-08-03 11:00:28 +00:00
d344162f41
Separate the setting of the DirectX texture and sampler states from
...
the setting of OpenGL states (now in applyTextureStateState and
applySamplerState).
2005-08-01 10:58:31 +00:00
5615513877
Separate the management of DirectX states and openGL states.
2005-08-01 09:20:55 +00:00
cc884e0ae6
Validate that the texture is no larger than the graphics cards largest
...
supported texture.
2005-07-30 19:05:58 +00:00
c6602b406b
Signed warning fixes.
2005-07-28 18:33:26 +00:00
c93da09265
Changed swapchains held by the device from an array to a linked
...
list. Also provide a notification function that that the swapchain can
be removed when it is released.
2005-07-27 15:33:17 +00:00
052d108bf5
DirectX uses a R/Z transform to translate a texture but under OpenGL a
...
Q transform must be used instead.
2005-07-26 20:01:29 +00:00
52b5842f70
Remove a load of IWineD3DSurface * casts that are no longer required.
2005-07-26 18:56:18 +00:00
7cb748fed2
Makes sure any internal reference counting is passed onto the parent,
...
any objects referenced by the internal stateblock are released when
the stateblock is released (we don't reference count while a
stateblock is recording, so recorded stateblocks have no references to
clean up).
2005-07-26 18:49:30 +00:00
ea6189e04b
Implement resource tracking, require for reset and evict managed
...
resources and provides extra sanity checks.
2005-07-26 10:34:15 +00:00
bd19d67ad1
Assorted spelling fixes.
2005-07-22 09:06:03 +00:00
948563267e
Implement the use of PBuffers for offscreen textures.
2005-07-19 11:39:24 +00:00
7d3ba6f562
Implemented a tidied up IWineD3Device_ColorFill.
2005-07-18 10:32:00 +00:00
e0241349c5
Dirty the surface (instead of the texture) when a render targets is
...
send and endscene is called to make sure that the correct surface is
updated.
2005-07-18 09:07:03 +00:00
41718267be
Fixed a division by 0 in setup_light that occurs with range is zero.
2005-07-15 16:32:25 +00:00
43466542a6
Correct a missplaced #if in IWineD3DDeviceImpl_CleanRender.
2005-07-15 09:57:52 +00:00
190e1597ff
Fix some missing-declarations warnings.
2005-07-14 12:19:53 +00:00
9253e0e39c
Tidy up some comments and formatting.
2005-07-13 14:15:54 +00:00
6a032491d3
Added basic memory management and tracking to wined3d.
2005-07-13 11:34:55 +00:00
9f7e794ca6
Implement UpdateTexture and UpdateSurface in wined3d.
...
Allow NULL members of WINED3DSURFACE_DESC to be set to Surface_GetDesc
so that the whole structure doesn't have to be filled just to get back
one value.
2005-07-12 17:02:47 +00:00
13621056db
Move parameters relating to opengl on the surface structure on to a
...
glDesciption member.
Removed Level and Target from LoadTexture, and reduced the dependency
on surface->device.
Fixed a couple of compiler warnings in d3d9.
2005-07-11 20:38:27 +00:00
520c2f0870
Implemented basic non-power 2 texture in wined3d.
...
Also fixed a typo in drawprim that was causing vertex declarations to
crash.
2005-07-11 14:25:54 +00:00
28dc5a8afc
Assorted spelling fixes.
2005-07-11 10:59:41 +00:00
1b578af404
Check to see if the vertex declaration is null before trying to
...
reference it.
2005-07-10 18:16:13 +00:00
3b0b430824
Added support for vertex declarations to wined3d, it's the last patch
...
to give wined3d basic functionality.
2005-07-07 20:45:39 +00:00
8a6799d47d
Implement render targets using either textures, swapchains or
...
standalone surfaces.
2005-07-07 20:35:05 +00:00
abb11f30cd
Implemented stateblocks in wined3d.
2005-07-05 14:05:18 +00:00
02c25a8981
Assorted spelling fixes.
2005-06-30 18:19:33 +00:00
18857f1170
Add support for samplers.
...
Switch from using d3d9 constants to wined3d constants so that there's
no recursive dependencies.
2005-06-24 11:53:07 +00:00
e8855c48d8
Make all newly created surfces dirty, so that they are loaded properly
...
the first time around.
Replace some calls to cubetexture in basetexture to calls to
basetexture.
Check that the level isn't out of bounds in calls to texture.
2005-06-23 16:44:19 +00:00
46e7c30a71
Implement swapchains.
2005-06-23 11:05:24 +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
2767543be9
- Output a FIXME when a surface with dimensions not being a power of
...
two is requested.
- Fail gracefully when IWineD3DImpl_CreateDevice fails to create the
front- or backbuffer.
2005-06-08 18:34:52 +00:00
eba47f1dfe
Make remaining OLE interface vtables const.
2005-06-06 19:50:35 +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
93416cdaf7
Assorted spelling fixes.
2005-03-23 13:15:18 +00:00
ba5eb14768
Encapsulate texture, surface encapsulated.
...
Added BindTexture, GetTextureDimensions, UnBindTexture.
Proper GetContainer support for surface.
SetContainer added to surface and volume.
SetInPbufferState added to surface (until gl context management is
implemented).
Minor changes:
- BaseTexture no longer 'holds' a reference to IWineD3DDevice to
prevent circular referencing.
- Better managment of referinging for texture.
- Some TODO's for implementing a context manager.
- Better preload implementation.
- Fix compile warning in device.c Set/GetSamplerState.
- Add QueryInterface support for surface.
- Format X8R8G8B8 added to locking.
2005-03-14 10:12:52 +00:00
7b261656fd
Added a stubbed out version of query to d3d9 and wined3d.
...
Update the d3d9 headers and creates wined3d types where d3d9 and d3d8
are incompatible.
2005-03-03 13:57:15 +00:00
16e8689008
Implemented guids for wined3d.
2005-03-02 13:44:58 +00:00
2121f7831e
Put all the stubs in wined3d in place, with some functionality copied
...
across from d3d9.
Make sure all d3d9 device function call their wined3d counterpart (or
perform a function).
2005-03-02 12:16:10 +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
f12d5b243a
- fix typo in wined3d_interface.h
...
- add needed defines in wined3d_interface.h
- add IWineD3DVertexDeclarationImpl_ParseToken9 for debug traces
- fix ParseDeclaration9
- limit flood of traces (single shot traces)
2005-01-27 10:40:57 +00:00
4c385f981d
- VertexDeclaration device APIs
...
- D3D9 declarations parsing
- a little better APIs (trying to avoid compile problems)
2005-01-26 20:54:00 +00:00
33025b203c
- Handle failures to allocate storage more gracefully.
...
- Only prototype the interfaces which are subclassed (I overdid it
last time!).
- Implement Get/Set Texture and GetBackBuffer, plus device's
GetDisplayMode / GetDeviceCaps.
- Make some of the d3d9 skeleton code issue fixme's to highlight code
which hasn't been migrated yet.
- Correct the d3d9 headers for D3DSURFACE_DESC which caused stack
corruption in demos.
2005-01-18 11:42:29 +00:00
bcecddc084
- Add texture support for all the texture types for d3d9->wined3d.
...
- Add prototypes for the COM interfaces.
- Fix some incorrect types from the last patch.
2005-01-17 13:44:57 +00:00
11db0ea655
Use only stored result of Interlocked* in AddRef/Release.
2005-01-12 19:50:22 +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
ae8682f277
Spelling fixes.
2004-12-22 15:02:14 +00:00
6fb1a20020
Assorted spelling fixes.
2004-12-20 19:27:06 +00:00
c4de952eb5
Add Clear, Present and EndScene support and fix a bug in the drawing
...
code.
2004-12-14 11:54:27 +00:00
2003c7ab11
Add {G,S}etRenderState and {G,S}etTextureStageState support, and
...
ensure the stateblock is fully populated at device startup.
2004-12-13 13:35:38 +00:00
ebe3c529b1
Janitorial: C booleans must not be compared against TRUE.
2004-12-09 14:07:59 +00:00
f738c146e2
Add {G,S}etIndices, {G,S}Viewport and enable the basic drawing
...
functionality into wined3d and call from d3d9.
2004-12-09 11:42:34 +00:00
880bc9ce9f
Fix compilation.
2004-11-30 21:05:27 +00:00
0a944ae319
Implement Material, Clip plane and Light support plus
...
MultiplyTransform.
2004-11-29 17:53:42 +00:00
eba27af4f1
Add Get/Set Transform support, plus BeginScene (does nothing).
2004-11-28 15:04:41 +00:00
73e8baffd2
Add indexbuffer support into wined3d.
2004-11-24 18:13:41 +00:00
289562eeb5
- Implement SetStreamSource
...
- Ensure wined3d objects maintain a reference count of at least that
of the d3dx version.
2004-11-23 13:52:46 +00:00
3bb5b093e8
Assorted spelling fixes.
2004-10-22 22:27:51 +00:00
447d5ed048
Implement the beginnings of the stateblock class, and a first method
...
to use it.
2004-10-21 20:59:12 +00:00
db7a50582c
- Add support (as far as was previously) for the VertexBuffer and
...
Resource classes in wined3d and use when called from d3d9.
- Reduce the header includes in all the d3d9 interface to one common
set in the private header.
2004-10-14 00:32:04 +00:00
ac490fabac
Add a IWineD3DDevice object type (empty for now), and create one when
...
an IDirect3DDevice object is created.
2004-10-07 04:22:21 +00:00
Roderick Colenbrander