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
fae73a1090
Assorted spelling fixes.
2005-08-17 09:56:24 +00:00
80cbb93163
Tidy up vertex shaders and bring the current code inline with the rest
...
of wined3d.
2005-08-17 09:54:54 +00:00
bcd56fe0e5
Assorted spelling fixes.
2005-08-12 18:22:06 +00:00
b814be9814
Fix gcc 4.0 warnings.
2005-08-11 10:57:47 +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
12a4bda618
Correct the starting values of MIN, MAX and MIP filter, they now match
...
the initial values in opengl.
2005-08-11 10:31:04 +00:00
bbc4f86aeb
Fix stateblock loop errors.
2005-08-08 17:59:02 +00:00
4e0f6a4501
Allow the WINED3DSBT_IMPL to be applied so that states can be synced
...
between render target contexts.
2005-08-08 11:01:17 +00:00
ec72ef14b5
Remove dxguid dependency.
2005-08-08 11:00:56 +00:00
6b91f5b31c
Set the apha channel to opaque when locking X8R8G8B8 backbuffers.
2005-08-03 21:17:08 +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
1f05577395
Improve on a fixup for the difference between opengl and directx pixel
...
centering of vertexes.
2005-08-03 19:14:19 +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
d15e2f1472
Fixed an off by one error in enumdisplaymodes, allowing sims 2 to
...
start up.
2005-07-30 19:11:38 +00:00
386470bedc
Tidy up some of the formatting in drawprim and add missing strided
...
data.
2005-07-30 19:06:14 +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
8955ac43a3
gcc 4.0 -Wpointer-sign fixes.
2005-07-28 10:16:21 +00:00
83f8704ba3
Return all elements when getDeclaration is called with pnumelements
...
set to 0.
2005-07-28 10:15:35 +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
5b9ddcce44
Correct a regression issue with per-app settings.
2005-07-26 11:14:38 +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
cc8762a91e
- add a new settings for vbo support
...
- use a struct to handle wined3d settings
- prepare VBO using some abstraction APIs
2005-07-24 17:11:33 +00:00
8d43d251b7
Remove unused variable in primitiveConvertToStridedData().
2005-07-22 18:27:04 +00:00
e2a2b5f6d5
- cleanup wined3d settings init (now closing opened registry keys)
...
- support per application settings
2005-07-22 18:26:05 +00:00
bd19d67ad1
Assorted spelling fixes.
2005-07-22 09:06:03 +00:00
f8079b6947
Correct a problem with the way that FVF vertex arrays containing
...
blends or orthographic is calculated.
2005-07-21 11:01:19 +00:00
2125fa9d37
Fixed regression that occurred because changes to texture loading were
...
committed before changes to textures and states to support the change
were committed.
2005-07-21 10:32:48 +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
18f3fcb1c2
Set mipmap levels correctly (even with ATI's buggy drivers).
2005-07-18 09:07:17 +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
fe80b4ea48
Implemented Get/Set/Free private data in resource.
2005-07-15 09:54:57 +00:00
3aefc4e4a4
Fixed a bug in Preload caused be a missing brace around a for loop,
...
slightly improved the way that errors are handled by passing back hr
from some function calls.
2005-07-14 12:31:05 +00:00
190e1597ff
Fix some missing-declarations warnings.
2005-07-14 12:19:53 +00:00
b220ce1343
Correct a few formats that were incorrect.
2005-07-13 19:38:39 +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
9b75356fc4
Tidy up the way caps are managed in GetDeviceCaps and FillGlCaps.
2005-07-10 17:48:07 +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
403d118555
Change all references to updateStateBlock to references to stateBlock
...
in drawprim.
2005-07-06 19:02:38 +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
784518d772
Correct GetDeviceCaps so that it uses wined3dcaps as required by the
...
earlier device caps patch.
2005-06-22 18:30:29 +00:00
ab88743c25
Moved a few registry keys from HKLM\Software\Wine to
...
HKCU\Software\Wine for consistency.
2005-06-20 16:04:32 +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
4dfabb0bd1
Rename _D3DCAPS9.MaxPixelShaderValue to the correct
...
_D3DCAPS9.PixelShader1xMaxValue.
2005-06-16 20:42:55 +00:00
2e4bca9db5
Added magic comments to all Wine-specific registry accesses to make
...
them easier to grep.
2005-06-13 18:56:00 +00:00
9c01e4274f
Fixed definition/declaration mismatches of newly static vtables.
2005-06-09 09:47:10 +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
62253b752f
Assorted spelling fixes.
2005-05-30 09:56:56 +00:00
a87d8a3db9
Added D3DDEVCAPS_HWRASTERIZATION to the DevCaps for scene
...
rasterization. Allows GuildWars to start.
2005-05-09 19:32:49 +00:00
34fa35dc99
Added rules for building import libraries in the individual dll
...
makefiles, and added support for building a .def.a static import
library too.
2005-05-09 14:42:30 +00:00
d62356aa1e
Added rules to build import libraries in the individual dll makefiles.
...
Generate import libraries with the right name right away instead of
using an intermediate .spec.def file.
2005-05-07 12:39:52 +00:00
c3116c5e61
Renamed ttydrv and x11drv to winetty.drv and winex11.drv respectively
...
to follow the namespace conventions and make it clear that they are
drivers and not dlls.
Moved the graphics driver configuration to HKLM\Software\Wine\Drivers.
2005-05-06 19:38:50 +00:00
086f77a034
- implement memory access APIs to VertexBuffers
...
- more valid implementation for IWineD3DImpl_Check* APIs (not more
S_OK for all cases)
2005-04-28 12:02:03 +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
9ed61de9a2
Get rid of HeapAlloc casts.
2005-03-24 21:01:35 +00:00
93416cdaf7
Assorted spelling fixes.
2005-03-23 13:15:18 +00:00
1d5df043d4
WineDirect3DCreate has 3 args in the source.
2005-03-21 10:52:32 +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
d0ee9f9309
Avoid spaces before preprocessor directives, that's not portable.
2005-03-02 12:23:20 +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
1c8eea8b74
Enable parsing of vendor strings not matching the expected template.
2005-02-23 12:42:04 +00:00
4d801b66e6
Assorted spelling fixes.
2005-02-10 19:19:35 +00:00
b10ba61112
Check that pstream is not null.
2005-02-08 12:10:57 +00:00
f777d70a63
Only create an X window for top-level windows, not for child windows.
...
Get rid of the X client window too, it's no longer needed.
2005-01-31 16:34:07 +00:00
27b8e5557e
- convert D3D8 VertexDecl to D3D9 format (D3DVERTEXELEMENT9 vector)
...
while parsing
- display result on traces
2005-01-28 11:30:13 +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
b6317bd537
- a very basic blending support on fast drawing path (to have better
...
performances on last games)
- some defines for VBO support
2005-01-26 21:06:19 +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
4f02b52c6b
Begin support of VertexDeclaration on wined3d using d3d8 code base
...
(handling d3d8 and d3d9 specs).
2005-01-19 19:34:49 +00:00
8a6295a057
Get rid of some TRACE(..., This->resource.ref).
2005-01-19 16:59:01 +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
1b8629b3d7
Correct loop check for enum display and include 32bit modes in 24bit.
2005-01-09 16:33:01 +00:00
5ad7d858e0
Do not check for non NULL pointer before HeapFree'ing it. It's
...
redundant.
2004-12-23 17:06:43 +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
66cae0d2a8
Fixed build problem with GL_VERSION_1_2.
2004-12-17 19:07:44 +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
819b0e1190
Add BaseTexture class support, call from d3d9.
2004-12-07 14:29:12 +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
b9e2bedac1
Copy and tidy up the code from dx8 create device into wined3d. Call
...
from wined3d and d3d8, but short term only use the code for real from
d3d9.
2004-10-08 20:52:33 +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
b519893e41
Move the GetDeviceCaps into the wined3d library and call from d3d9.
2004-10-06 00:05:29 +00:00
67aa858a31
Assorted spelling fixes.
2004-10-05 18:15:29 +00:00
c579fa6213
Move the Check* type functions into wined3d and copy from d3d9, and
...
flag that they are mostly stubs.
2004-10-05 02:14:06 +00:00
c3421ea434
Move into wined3d and call from d3d9 the GetAdapterId function and
...
copy all the gl declarations into the more global wined3d_gl header
file.
2004-09-29 21:26:47 +00:00
ae5a436873
- Make d3d8 know about the wined3d device and start using it.
...
- Move some of the screen mode related functions into wined3d and add
untested support for the new d3d9 options of providing the format to
some of the calls.
- Move other functions from the directx interface into the common
library and implement the calls from d3d9 as well.
- Copy across the first of the functions used to make traces more readable,
creating utils.c to store them in. Eventually the ones in d3d8 will be
removed but for now just duplicate the code.
2004-09-28 02:12:12 +00:00
24ab49e250
Create a wined3d interface, and generate a wined3d object in the d3d9
...
create method. Make the first (simple) call implementation into the
new wined3d interface.
2004-09-23 04:34:27 +00:00
2b5b00b0ff
Fixed position of tmp.f assigned like in dlls/d3d8/shader.c.
...
Fixed strict aliasing problem.
2004-04-26 20:05:52 +00:00
9e4ed6460c
.spec.c files are no longer used for 32-bit dlls.
2004-03-24 03:36:44 +00:00
e8a339c1d2
Portability fixes for LSB compatibility.
2004-03-01 21:32:02 +00:00
20b4585e3c
Only link against libdxguid where necessary.
2004-01-27 00:11:16 +00:00
0196861349
Add the wined3d dll for beginning a cleaner d3d architecture that will
...
contain the shared openGL code needed for all wine direct3d
implementations.
2003-11-14 03:50:35 +00:00
Oliver Stieber