cfcdb6515b
wined3d: Sort of oversized surface support.
2006-05-20 14:06:09 +02:00
566cdcf55c
wined3d: Implement IWineD3DDevice::SetDisplayMode.
2006-05-20 14:05:06 +02:00
1b320431b8
wined3d: Check registry for UseGLSL enabled.
2006-05-18 16:40:32 +02:00
42b89791ff
wined3d: Take predication tokens into account.
...
Each instruction can have a predication token. Account for it in the
trace pass, register count pass, and store it in the SHADER_OPCODE_ARG
structure for generation. MSDN claims the token is at the end of the
instruction, but that's not true - testing a demo, which lets me
manipulate the shader shows the predication token is the first source
token immediately following the destination token.
2006-05-18 10:32:54 +02:00
746d1b1cd3
wined3d: Modify shader_dump_param() to take into account address token.
...
Currently we hardcode a0.x, which I think is correct for shaders 1.0.
However, for shaders 2.0, we must look into the address token, and
print the register there. Handle both cases to correct the trace.
2006-05-17 10:55:11 +02:00
03b67e3030
wined3d: Use shader_get_param() in trace pass, reg. count pass, generation pass.
...
Change the trace pass, the register counting pass, and the hw
generator pass to take into account the new get_params() function. For
hw generation, store the address tokens into the SHADER_OPCODE_ARG
structure, so they're available to generator functions.
2006-05-17 10:54:23 +02:00
404eff792f
wined3d: Add shader_get_param() fn, which processes address tokens.
...
Add a new function to process parameters.
On shaders 1.0, processing parameters amounts to *pToken++.
On shaders 2.0+, we have a relative addressing token to account for.
This function should be used, instead of relying on num_params everywhere.
2006-05-17 10:53:18 +02:00
8b7401c39a
wined3d: Shaders: share dump_param function, version functions.
2006-05-15 16:07:31 +02:00
2f724834f8
wined3d: Implement IWineGDISurface.
2006-05-15 14:02:03 +02:00
9abdac6aaa
wined3d: Implement IWineD3DDevice::ProcessVertices.
2006-05-15 13:57:17 +02:00
257692e087
wined3d: Initialize volume format.
2006-05-11 12:11:42 +02:00
c61af3af8d
wined3d: Share shader_dump_ins_modifiers().
...
Share shader_dump_ins_modifiers(), and make vertex shaders use it.
The saturate modifer (_sat) is valid on vs_3_0+, and it isn't being
shown in the trace.
2006-05-11 12:10:59 +02:00
e9927d6ffd
wined3d: Further split GLSL & ARB_v/f_program generation and allow GLSL functions to be called.
2006-05-10 12:20:39 +02:00
246677ae46
wined3d: Modified the opcode tables (and struct) to include a pointer to a GLSL generator function.
2006-05-10 12:20:08 +02:00
36b0b9cc1c
wined3d: Added new GenerateShader function for Vertex Shaders & declare generate_base_shader().
2006-05-10 12:18:08 +02:00
cc2ea9e08c
wined3d: Place # of textures, addresses, & temps used inside the baseShader struct to prepare for GenerateShader merge.
2006-05-10 12:16:22 +02:00
653e71d774
wined3d: Further split up GenerateProgramArbHW for pixelshaders.
2006-05-10 12:16:02 +02:00
5308e026d1
wined3d: Move program_dump_decl_usage into baseshader.
2006-05-10 12:14:39 +02:00
cdfe848b6d
wined3d: Break out arithmetic instruction processing.
2006-05-10 11:28:11 +02:00
320e33dcb3
wined3d: Merge register counting pass.
2006-05-10 11:26:01 +02:00
9b29fb6860
wined3d: Implement IWineD3DSurface::SetColorKey.
2006-05-09 20:46:59 +02:00
08dc9e003d
wined3d: Implement IWineD3DSurface::IsLost and Restore.
2006-05-09 20:45:39 +02:00
10ff0d8184
wined3d: rhw vertex fixup.
...
Change the rhw=0 range to ]1e-8,1e-8[ and move the value to a constant
in wined3d_types.h
2006-05-09 20:45:27 +02:00
1d0c672393
wined3d: Share get_opcode.
2006-05-09 20:45:10 +02:00
c93239d36d
wined3d: Clean up per version shader limits code.
2006-05-09 11:58:14 +02:00
5f10560762
wined3d: Addline cleanup.
2006-05-09 11:55:45 +02:00
af462957c3
wined3d: Implement IWineD3DSurface::GetDC and IWineD3DSurface::ReleaseDC.
2006-05-08 20:58:27 +02:00
4b3079438b
wined3d: Share get_register_code().
2006-05-08 15:15:30 +02:00
a173c8e35a
wined3d: Add IWineD3DDevice::DrawPrimitiveStrided.
2006-05-08 14:51:13 +02:00
1cfbc903d5
wined3d: Add some surface flags.
2006-05-08 14:50:58 +02:00
a6f71af021
wined3d: Implement IWineD3DPalette.
2006-04-21 11:28:11 +02:00
04da3ce2d1
wined3d: Implement GetHWND and SetHWND.
2006-04-19 12:55:03 +02:00
a6206836e6
wined3d: Implement IWineD3DDevice::EnumDisplayModes.
2006-04-19 12:53:30 +02:00
d04f0507cf
wined3d: Implement Init3D and Uninit3D.
2006-04-19 12:43:22 +02:00
cff4e1ea4b
wined3d: Add IWineD3DPalette.
2006-04-18 11:11:49 +02:00
ffc8e46e76
wined3d: Add IWineD3DSurface::Blt.
2006-04-17 11:19:30 +02:00
e0c8773199
wined3d: Add a resource dumper.
2006-04-12 12:54:28 +02:00
634698cb19
wined3d: Print all errors in checkGLcall.
2006-04-10 12:24:23 +02:00
cf4b91f074
wined3d: Add WINED3DBOX to wined3d_types.h.
2006-04-07 14:55:50 +02:00
63fd9a7a98
wined3d: Add WINED3DTEXTUREFILTERTYPE to wined3d_types.h.
2006-04-06 22:22:35 +02:00
f6ed704f96
wined3d: Make use of WINED3DDEVICE_CREATION_PARAMETERS.
2006-04-03 21:35:44 +02:00
59af5c4a62
wined3d: Move fields common to vertex shaders and pixel shaders to IWineD3DBaseShader.
2006-03-30 21:55:15 +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
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
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
913df5b143
wined3d: Consistently use WINED3DRESOURCETYPE.
2006-03-10 21:43:00 +01:00
46e8d67787
wined3d: Update the glOrtho between 2 rhw draws if the viewport was changed.
2006-02-13 13:25:21 +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
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
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
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
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
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
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
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
93ab695a5c
Fix gcc 4.0 warnings.
2005-08-26 08:53:31 +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
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
80cbb93163
Tidy up vertex shaders and bring the current code inline with the rest
...
of wined3d.
2005-08-17 09:54:54 +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
386470bedc
Tidy up some of the formatting in drawprim and add missing strided
...
data.
2005-07-30 19:06:14 +00:00
8955ac43a3
gcc 4.0 -Wpointer-sign fixes.
2005-07-28 10:16:21 +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
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
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
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
fe80b4ea48
Implemented Get/Set/Free private data in resource.
2005-07-15 09:54:57 +00:00
b220ce1343
Correct a few formats that were incorrect.
2005-07-13 19:38:39 +00:00
6a032491d3
Added basic memory management and tracking to wined3d.
2005-07-13 11:34:55 +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
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
46e7c30a71
Implement swapchains.
2005-06-23 11:05:24 +00:00
9c01e4274f
Fixed definition/declaration mismatches of newly static vtables.
2005-06-09 09:47:10 +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
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
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
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
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
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
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
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
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
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
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
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
Stefan Dösinger