e534340450
wined3d: Improve render target to texture blits.
2007-02-13 12:04:20 +01:00
f22d37e4dd
wined3d: Use the context manager to prepare for blitting.
2007-02-13 12:04:08 +01:00
c1623d4e7b
wined3d: Use the context manager to prepare for drawing.
2007-02-13 12:03:40 +01:00
380930dc54
wined3d: Store dirty states per context.
2007-02-13 11:55:07 +01:00
e6c9a073b0
wined3d: Store state optmization members in the context.
2007-02-13 11:50:38 +01:00
c739c387b6
wined3d: Add a per context structure for context management.
2007-02-13 11:50:14 +01:00
5f1a1bbc84
wined3d: Properly round negative values in shader_glsl_mov.
2007-02-12 14:12:29 +01:00
fa97fbdcad
wined3d: Make shader_cleanup more useful.
2007-02-12 12:37:48 +01:00
67b1f4a7e9
wined3d: BeginScene and EndScene tests and fixes.
2007-02-12 12:08:34 +01:00
89840c0517
wined3d: Report D3D caps properly for ATI cards.
2007-02-05 14:01:43 +01:00
7c40799df0
wined3d: Remove the d3d9types.h include from wined3d_private.h.
2007-01-23 11:27:05 +01:00
32778357f8
wined3d: Use ARB_VERTEX_PROGRAM instead of GL_VERTEX_PROGRAM_ARB with GL_SUPPORT.
...
Spotted by Marcus Meissner.
2007-01-23 11:26:58 +01:00
beed89cde4
wined3d: The sincos instruction is valid for ps/vs 2.1 as well.
2007-01-19 12:29:17 +01:00
efed4c33c2
wined3d: gl_FragDepth is a float, so fixup the write mask.
2007-01-19 12:29:11 +01:00
4352934b84
wined3d: Use SetupFullscreenWindow() to make the window fullscreen.
2007-01-19 12:29:05 +01:00
6112522122
wined3d: Move SetupFullscreenWindow() and RestoreWindow() from IDirectDrawImpl to IWineD3DDeviceImpl.
2007-01-19 12:28:58 +01:00
a31f2fd9fc
wined3d: Use %s in trace.
2007-01-19 12:28:58 +01:00
b0bde6b87c
Assorted spelling fixes.
2007-01-18 12:56:52 +01:00
955fb95eb6
wined3d: Give shader constants their own debug channel.
2007-01-18 12:09:09 +01:00
79c7aeab00
wined3d: Fix a typo.
2007-01-18 12:09:03 +01:00
d429ff5b69
wined3d: When switching color material, apply the material we were previously tracking.
...
This fixes a regression introduced by 329670c7f1
2007-01-18 12:08:57 +01:00
612a74a994
wined3d: Don't set Parm when isDiffuseSupplied is FALSE in state_colormat(), it isn't used anyway.
2007-01-18 12:08:45 +01:00
d4ca34dd9b
d3d: Fix the D3DFMT_XXX constant declarations.
2007-01-18 12:05:05 +01:00
354fdae524
wined3d: Implement per stream offsets.
2007-01-17 11:24:04 +01:00
1d3abdeeaa
wined3d: Store the stream number in the strided structure.
2007-01-17 11:23:54 +01:00
71f923a6d2
wined3d: Improve drawStridedSlow a bit.
2007-01-17 11:23:41 +01:00
e3cc00cf47
wined3d: Add a glsl_src_param_t type, pass it to shader_glsl_add_src_param() instead of three separate character arrays.
2007-01-16 16:14:21 +01:00
04e6250c87
wined3d: Add a glsl_dst_param_t type, pass it to shader_glsl_add_dst_param() instead of three separate character arrays.
2007-01-16 16:13:58 +01:00
6f3fae4e04
wined3d: Simplify shader_glsl_get_write_mask().
2007-01-16 16:13:29 +01:00
c6bccc9278
wined3d: Simplify shader_glsl_get_swizzle().
2007-01-16 16:13:19 +01:00
48f82d3f5e
wined3d: Fix pshader_glsl_tex() and pshader_glsl_texcoord().
2007-01-16 16:13:10 +01:00
c3bfef8d7e
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_callnz().
2007-01-16 16:12:46 +01:00
50e0deafca
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_breakc().
2007-01-16 16:12:37 +01:00
f593cd0de8
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_ifc().
2007-01-16 16:12:26 +01:00
a89edf1be9
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_if().
2007-01-16 16:12:18 +01:00
9f22df26ef
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_rep().
2007-01-16 16:12:11 +01:00
2cb49c67db
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_loop().
...
Fix the comment.
2007-01-16 16:12:02 +01:00
cf1a3cc81a
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3vspec().
...
Use shader_glsl_get_sample_function().
Use the GLSL builtin reflect() function.
2007-01-16 16:11:45 +01:00
f0fb61daed
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3spec().
...
Use shader_glsl_get_sample_function().
2007-01-16 16:11:26 +01:00
ba1740909e
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3().
2007-01-16 16:11:13 +01:00
b26fae9a25
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3tex().
...
Use shader_glsl_get_sample_function().
2007-01-16 16:11:02 +01:00
950783d4fd
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2tex().
2007-01-16 16:10:43 +01:00
92ab90eee8
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3pad().
2007-01-16 16:10:34 +01:00
459e0bf633
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2pad().
2007-01-16 16:10:23 +01:00
04144983eb
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2depth().
2007-01-16 16:10:17 +01:00
1947b27380
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texdp3().
2007-01-16 16:10:07 +01:00
3cd84d9ab6
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texdp3tex().
2007-01-16 16:10:01 +01:00
0fcb682af6
wined3d: Rewrite pshader_glsl_texreg2rgb to properly take the write mask into account.
...
Use shader_glsl_get_sample_function() rather than having the instruction handler figure it out itself.
Get rid of shader_glsl_add_dst_old().
2007-01-16 16:09:50 +01:00
67e203215f
wined3d: Split out getting the sample function and coordinate mask from shader_glsl_sample().
2007-01-16 16:09:23 +01:00
54137bacfa
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texreg2gb().
2007-01-16 16:09:09 +01:00
8325937ded
wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texreg2ar.
...
Use the correct source swizzle.
2007-01-16 16:08:58 +01:00
7d07f31045
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_dst().
2007-01-16 16:08:35 +01:00
146093af33
wined3d: Rewrite shader_glsl_rcp() to properly take the write mask into account.
2007-01-16 16:08:19 +01:00
9857158a99
wined3d: Rewrite shader_glsl_expp() to properly take the write mask into account.
2007-01-16 16:08:08 +01:00
2c60906ec4
wined3d: Rewrite shader_glsl_cnd() to properly take the write mask into account.
...
Take the difference between ps 1.4 and earlier versions into account.
2007-01-16 16:07:56 +01:00
693b6ef876
wined3d: Rewrite shader_glsl_cmp() to properly take the write mask into account.
2007-01-16 16:07:44 +01:00
1414d75a3f
wined3d: Rewrite shader_glsl_lrp() to properly take the write mask into account, use the GLSL mix instruction.
2007-01-16 16:07:35 +01:00
e0588e7475
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_lit().
2007-01-16 16:07:15 +01:00
cb5c47f8fe
wined3d: Rewrite shader_glsl_mov() to properly take the write mask into account.
...
In case of writing to an address register round the source.
2007-01-16 16:07:05 +01:00
9425aef623
wined3d: Rewrite pshader_glsl_dp2add() to properly take the write mask into account.
2007-01-16 16:06:37 +01:00
f3a4d35dee
wined3d: Rewrite shader_glsl_dot() to properly take the write mask into account.
2007-01-16 16:06:25 +01:00
b3ff0c3703
wined3d: Rewrite shader_glsl_map2gl() to properly take the write mask into account.
2007-01-16 16:06:11 +01:00
7252b4d340
wined3d: Give WINED3DSIO_CRS its own function, properly take the write mask into account.
2007-01-16 16:05:49 +01:00
b557a8021a
wined3d: Move WINED3DSIO_SGE & WINED3DSIO_SLT from shader_glsl_map2gl() to shader_glsl_compare() where they belong.
...
Properly take the write mask into account
2007-01-16 16:04:18 +01:00
e0f0bf1d08
wined3d: Rewrite shader_glsl_mad() to properly take the write mask into account.
2007-01-16 16:03:59 +01:00
b0fd23e844
wined3d: Rewrite shader_glsl_arith() to properly take the write mask into account.
2007-01-16 16:03:50 +01:00
4452120007
wined3d: Rewrite shader_glsl_sincos() to properly take the write mask into account.
...
The write mask can only be one of .x, .y, .xy
2007-01-16 16:03:38 +01:00
dc0d2a27f1
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_get_register_name().
2007-01-16 16:03:25 +01:00
b8bc92dc7b
wined3d: Pass a mask to shader_glsl_add_src_param().
2007-01-16 16:03:15 +01:00
1bfc08e081
wined3d: Rename shader_glsl_add_dst() to shader_glsl_add_dst_old(), add shader_glsl_append_dst().
2007-01-16 16:02:41 +01:00
cb26d59d26
05/49: wined3d: Only add line numbers for new lines in shader_addline().
2007-01-16 16:02:28 +01:00
b28bd67fd9
wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize.
...
gl_FogFragCoord and gl_PointSize are floats rather than vec4s in GLSL,
so they shouldn't have a destination swizzle, and the write mask we
return should consist of only the first component.
2007-01-16 16:02:21 +01:00
16cf41413b
wined3d: Return the (binary) write mask from shader_glsl_add_dst_param().
2007-01-16 16:02:13 +01:00
9f4f02b5fb
wined3d: Split shader_glsl_add_param() in shader_glsl_add_src_param() and shader_glsl_add_dst_param().
2007-01-16 16:02:06 +01:00
aa4d88d6f8
wined3d: Add a comment about D3D write masks and GLSL destination swizzles.
2007-01-16 16:01:55 +01:00
5ddac44dc2
wined3d: Do not play with WS_VISIBLE, this causes unwanted mapping/unmapping of the window.
2007-01-15 12:44:18 +01:00
8658d20b3e
wined3d, d3d9: Caps correction.
2007-01-15 12:44:03 +01:00
8c8d1e4f89
wined3d: Do not force dynamic usage on transformed buffers.
2007-01-15 12:43:46 +01:00
e328e24daa
wined3d: Better tracking of vertex buffer assignments.
2007-01-15 12:43:40 +01:00
03389acc30
wined3d: Do not free regularily locked surfaces.
2007-01-15 12:43:29 +01:00
a7916d8011
wined3d: Revert "wined3d: Do not preload vertex buffers in unlock.".
...
This reverts commit 6fb1869b98
2007-01-15 12:43:11 +01:00
ce0773a02e
wined3d: Avoid a NULL pointer dereference in UpdateTexture (Coverity).
2007-01-12 11:50:04 +01:00
723b32b1c9
wined3d: Do not perform a NULL check on riid (Coverity).
2007-01-12 11:49:46 +01:00
cb74603e43
d3d9: Implement IDirect3DDevice9::StretchRect.
2007-01-12 11:49:38 +01:00
94be42eb2d
wined3d: Do not block waiting for occlusion query result in GetData.
2007-01-12 11:24:20 +01:00
60c9ea6751
wined3d: Remove dead NV_TEXTURE_SHADER code
2007-01-10 22:03:50 +01:00
b07c48c499
wined3d: Do not activate / deactivate texture dimensions twice.
2007-01-10 22:03:28 +01:00
70831d1d2d
wined3d: D3D7 vertex buffers never change their declaration.
2007-01-10 22:03:17 +01:00
08c7b3947b
wined3d: Fix a capital letter in a parameter name.
2007-01-10 22:03:09 +01:00
7fd246ebe3
wined3d: Add copyright statements to state.c.
2007-01-10 22:02:23 +01:00
fe6165db19
wined3d: Attempt to remove some tabs smuggled in by xcode.
2007-01-10 22:02:10 +01:00
953f8d7b37
wined3d: Do not warn about unsupported point sizes if the default values are set.
2007-01-10 22:01:57 +01:00
60ea760945
wined3d: Avoid false resultarg warnings.
2007-01-10 22:01:46 +01:00
d4b63bbd87
wined3d: Store the scissor rect in the stateblock.
2007-01-10 22:01:20 +01:00
222c531b1a
wined3d: Count the framerate per swapchain, not globally.
2007-01-10 22:00:47 +01:00
9b4920996e
wined3d: Move material applying to the state table.
2007-01-10 22:00:34 +01:00
dfeb40cbff
wined3d: Remove the invymat from drawprim.c.
2007-01-10 22:00:25 +01:00
329670c7f1
wined3d: Do not reset the material.
2007-01-10 22:00:17 +01:00
33af3c5c83
janitorial: Use the C standard for multiline strings.
2007-01-10 12:28:19 +01:00
290ae94e66
wined3d: Remove stray '\' at end of lines.
2007-01-09 12:03:50 +01:00
577f8db7cf
wined3d: Fix np2 textures.
2007-01-08 21:00:23 +01:00
9f2e0fa2e0
wined3d: Do not try to read the vertex decl when the stateblock isn't finalized.
2007-01-08 21:00:14 +01:00
2e55c196ee
wined3d: Remove some unneeded context cache members from the device.
2007-01-08 21:00:04 +01:00
d47ec21280
wined3d: Vertex buffers can use the declaration from the device.
2007-01-08 20:59:57 +01:00
6fb1869b98
wined3d: Do not preload vertex buffers in unlock.
2007-01-08 20:59:48 +01:00
b310e98693
wined3d: Clean up drawprim a bit.
2007-01-08 20:59:38 +01:00
478d22f742
wined3d: Do not keep internal references on index buffers.
2007-01-08 20:59:17 +01:00
3581d8e8d8
wined3d: Do not keep internal references on vertex buffers.
2007-01-08 20:59:06 +01:00
467fa4e702
wined3d: Do not keep internal references on pixel shaders.
2007-01-08 20:58:53 +01:00
7123d617a4
wined3d: Do not keep internal references on vertex shaders.
2007-01-08 20:58:45 +01:00
15f91b4ad3
wined3d: Do not keep internal references to the vertex declaration.
2007-01-08 20:58:36 +01:00
fdb62cbaeb
wined3d: Do not activate vertex shaders needlessly.
2007-01-08 20:58:21 +01:00
09ab812e79
wined3d: Avoid negative draw start indices.
2007-01-08 20:58:11 +01:00
8e37fcd266
wined3d: Move applying shader constants to the state table.
2007-01-08 20:57:57 +01:00
f2dfbe76c2
wined3d: Remove the general query fixme.
2007-01-08 20:57:03 +01:00
799770b992
wined3d: Apply shaders in their state handlers.
2007-01-08 20:56:51 +01:00
7e314011fb
wined3d: Move debugging fixmes from drawprim to the stream source handler.
2007-01-08 20:56:36 +01:00
27bac24acb
wined3d: Re-add the fixed function stream source trace.
2007-01-08 20:56:06 +01:00
d5f18e6a63
wined3d: Move applying the gl stream sources to the state table.
2007-01-08 20:55:51 +01:00
d8c67c3415
wined3d: state_pointsprite should apply to all texture units.
2007-01-04 21:36:59 +01:00
7ae71a92a2
wined3d: Skip sampler state application for stages that aren't mapped to a texture unit.
2007-01-04 21:23:42 +01:00
aced8de853
wined3d: Skip WINED3DTSS_TEXCOORDINDEX state application for stages that aren't mapped to a texture unit.
2007-01-04 21:23:37 +01:00
c7fad607ba
wined3d: Don't do WINED3DTSS_ALPHAOP texture operations for stages that aren't mapped to a texture unit.
2007-01-04 21:23:31 +01:00
8c530333cb
wined3d: Don't do WINED3DTSS_COLOROP texture operations for stages that aren't mapped to a texture unit.
2007-01-04 21:18:10 +01:00
bbb2b7fd98
Assorted spelling fixes.
2007-01-04 11:27:31 +01:00
2ffc90d670
wined3d: Dirtify the stream sources in DrawPrimitiveUP.
2007-01-04 10:58:29 +01:00
51a9810693
wined3d: Move decoding the streams to their own inline function.
2007-01-04 10:58:20 +01:00
5d2ce97136
wined3d: Catch NOP SetStreamSource changes.
2007-01-04 10:58:02 +01:00
4e0f7ccd7d
wined3d: Catch nop pixel shader changes.
2007-01-04 10:57:49 +01:00
cd9a3517f3
wined3d: Catch NOP vertex declaration changes.
2007-01-04 10:57:41 +01:00
0d700bef5d
wined3d: Break the viewport out of the vertex declaration state.
2007-01-04 10:57:33 +01:00
d0f1c23c93
wined3d: Select a proper texture unit in LockRect and dirtify the state.
2007-01-03 11:20:06 +01:00
e26e3ee5f3
wined3d: Remove d3ddevice_set_ortho.
2007-01-03 11:19:55 +01:00
82bd0790ed
wined3d: Move the projection matrix into its own state.
2007-01-03 11:19:45 +01:00
a0ff9826ad
wined3d: Break the lighting state out of the vertex decl.
2007-01-03 11:19:31 +01:00
5fa0f7f775
wined3d: Move the world matrix to the state table.
2007-01-03 11:19:09 +01:00
20de200fa3
wined3d: Move the functionality of primitiveInitState to the state table.
2007-01-03 11:17:08 +01:00
a48bbc3611
wined3d: Add a viewport state to the state table.
2007-01-03 11:10:13 +01:00
438c172841
wined3d: Move decoding the vertex declaration to the vertexshader state handler.
2007-01-03 11:10:01 +01:00
04ce141940
wined3d: Pass the user pointer strided structure via the device implementation.
2007-01-03 11:03:03 +01:00
71631f7638
wined3d: Use the baseVertexIndex in the stateblock.
2007-01-03 11:02:51 +01:00
d905795503
wined3d: Sampler variables wrongly named 'shader'.
2007-01-03 11:01:26 +01:00
b3d018f99b
wineded3: dirtyend set to more than resource size.
2007-01-02 20:30:08 +01:00
d955715180
wined3d: Fix point handling.
2007-01-02 20:29:53 +01:00
656fc93815
Use GetDC instead of CreateDC where possible.
2007-01-02 17:16:36 +01:00
d46d7d13ab
Revert "wined3d: Simplify the get_write_mask and get_swizzle functions."
...
This reverts commit a9f658f6a6
2007-01-02 13:21:47 +01:00
f9e5c12019
wined3d: Clip mouse after resolution change while creating default swap chain.
2007-01-02 13:21:19 +01:00
ef1ebb6e4d
wined3d: Add emtpy vertex declaration and related states to the state table.
2007-01-02 12:29:18 +01:00
a710f721c3
wined3d: Add stub handlers for world matrices 1-255.
2007-01-02 12:29:11 +01:00
091f9c28e4
wined3d: Put the decoded strided data structure into the device.
2007-01-02 12:29:04 +01:00
Stefan Dösinger