232dfc9b3a
wined3d: Vertex fixups.
2006-06-26 13:02:36 +02:00
7d31ab95e4
wined3d: Add support for VBOs to the drawing code.
2006-06-26 13:02:19 +02:00
495e46197a
ddraw/wined3d: IDirectDrawSurface7::SetSurfaceDesc corrections.
2006-06-26 12:38:55 +02:00
3518747165
wined3d: Pixel format cleanup.
2006-06-21 12:15:50 +02:00
6601e8eefe
wined3d: Add an "\n" to a fixme to fix an overflow.
2006-06-21 11:16:15 +02:00
e0ccbeb282
wined3d: Bind correct number of samplers for GLSL shaders.
...
We are only checking against GL_MAX_TEXTURES when binding samplers,
when we should be checking against the maximum number of samplers that
the card supports. Spotted by H. Verbeet.
2006-06-21 11:16:07 +02:00
0b09ecb291
wined3d: Move D3DSIO_DEF instruction for ARB shaders into arb_program_shader.c.
2006-06-20 11:28:15 +02:00
99c855e6ae
wined3d: Fix DEF instructions in GLSL for non-Nvidia platforms.
...
- NVidia allows "const vec4 = {1.0, 2.0, 3.0, 4.0};", even though
that's not part of the spec.
- It should be "const vec4 = vecr4(1.0, 2.0, 3.0, 4.0);"
- This patch fixes this for D3DSIO_DEF and D3DSIO_DEFI.
2006-06-20 11:28:05 +02:00
c13f097de3
wined3d: Correct implementation of D3DSIO_LOOP.
...
I initially misread the specification. src0.x is the iteration count,
not the max amount for the loop register. This fixes that.
2006-06-19 11:11:45 +02:00
fd83de7129
wined3d: Fix lookup for LOOP register.
2006-06-19 11:11:24 +02:00
9afa540eb5
wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers.
2006-06-19 11:11:05 +02:00
406ec20459
wined3d: Load boolean and integer constants into the GLSL shader program.
2006-06-19 10:59:58 +02:00
f444009bfb
wined3d: Implement locally defined boolean and integer constants in GLSL.
2006-06-19 10:59:13 +02:00
34d271bab6
wined3d: Add preliminary support for constant boolean and integer registers in GLSL.
...
- Separate the declaration phase of the shader string generator into
the arb and glsl specific files.
- Add declarations and recognition for application-sent constant
integers and booleans (locally defined ones will follow).
- Standardize capitilization of pixel/vertex specific variable names.
2006-06-19 10:50:14 +02:00
2d8e05f8a1
wined3d: Move constant loading into target-specific files.
...
- Moves GLSL constant loading code into glsl_shader.c and out of the
over-populated drawprim.c.
- Creates a new file named arb_program_shader.c which will hold code
specific to ARB_vertex_program & ARB_fragment_program.
- Remove the constant loading calls from drawprim.c
2006-06-19 10:49:52 +02:00
7f18b4e5fa
wined3d: Remove dead vertex shader code.
2006-06-19 10:39:36 +02:00
edaac6f696
wined3d: GetScissorRect should use zero-based scissorBox (Coverity).
2006-06-16 14:42:36 +02:00
9eb81363ad
Add trailing '\n's to ok() calls.
...
Remove spaces before '\n'.
2006-06-16 11:32:42 +02:00
11ae0f6386
Assorted spelling fixes.
2006-06-16 11:32:29 +02:00
701ce97d65
wined3d: Add and use GL_EXT_fog_coord defines.
2006-06-16 11:29:31 +02:00
3862f8e3d7
wined3d: Support more than one back buffer.
2006-06-15 16:51:41 +02:00
5c3c5903a5
wined3d: Correct vertex fog for transformed vertices and correctly
...
handle non-vertex, non-table fog.
2006-06-15 12:24:09 +02:00
cc06ed3d53
wined3d: Implement more GLSL instructions.
...
- Implemented: D3DSIO_SGN, LOOP, ENDLOOP, LOGP, LIT, DST, SINCOS
- Process instruction-based modifiers (function existed, it just
wasn't being called)
- Add loop checking to register maps.
- Renamed "sng" to "sgn" for D3DSIO_SGN - it's not handled anywhere
except for GLSL, so won't matter.
2006-06-15 12:20:20 +02:00
836b5c7e93
wined3d: Use unsigned int instead of size_t to avoid printf format warnings.
2006-06-13 14:14:20 +02:00
45dbb78d73
wined3d: Fix params for DP2ADD/TEXLDD.
...
DP2ADD is valid on pshaders 2.0 and above, has 4 parameters.
TEXLDD is valid on pshaders 2.x and above, has 5 parameters.
2006-06-13 11:40:23 +02:00
8c6ee8df0d
wined3d: Mark instructions without a destination token.
...
There are a total of 17 instructions without a destination token. Of
those 9 have num_params != 0, which means that we will not process any
of them correctly, because we assume the first token (if present) is a
destination token.
Those are basically all the flow control instructions, which we plan to
support very soon. They have source tokens, and no destination. Add a
flag that marks them up to the ins table. Use this flag in the trace
pass, and generation pass.
2006-06-13 11:40:22 +02:00
14a52e5c09
wined3d: Keep pshader and vshader constants in GLSL separate.
...
GLSL uniforms have as scope the entire program.
To prevent conflicts, name pshader and vshader constants differently.
Based on a patch by Jason Green.
2006-06-13 11:40:22 +02:00
0d08316523
wined3d: Improve Sampler support on 2.0 and 3.0 shaders.
...
- track sampler declarations and store the sampler usage in reg_maps structure
- store a fake sampler usage for 1.X shaders (defined as 2D sampler)
- re-sync glsl TEX implementation with the ARB one (no idea why they diverged..)
- use sampler type in new TEX implementation to support 2D, 3D, and Cube sampling
- change drawprim to bind pixel shader samplers
Additional improvements:
- rename texture limit to texcoord to prevent confusion
- add sampler limit, and use that for samplers - *not* the same as texcoord above
2006-06-13 11:40:22 +02:00
e99926ee06
wined3d: Cast more things.
...
Anything with a swizzle has to be casted to vec4, or it won't work properly.
There's multiple ways to do this, for the moment pick the easiest one.
2006-06-13 11:40:22 +02:00
a1f4dfe4e3
wined3d: Add support for shader model 3.0 I/O registers.
...
SM 3.0 can pack multiple "semantics" into 12 generic input/output registers.
To support that, define temporaries called IN and OUT, and use those as
the output registers. At the end of the vshader, unpack the OUT temps
into the proper GL variables. At the beginning of the pshader, pack the
GL variables back into 12 IN registers.
2006-06-13 11:40:22 +02:00
1a3003338f
wined3d: Trivial cleanups
...
- compiler warnings and errors should be FIXME
- remove obsolete comment, and change variable type.
2006-06-13 11:40:22 +02:00
a42925ee09
wined3d: Register map cleanups.
...
Various cleanups:
- do not use DWORD as a bitmask, that places artificial limit of 32 on
registers
- track attributes that are used and declare only those
- move declarations function call in pshader/vshader to allow us to
insert pixel or vertex specific code between the declarations and
the rest of the code
- remove redundant 0 intializers
- remove useless continue statement
2006-06-13 11:40:22 +02:00
17b0d26c1e
wined3d: Share trace pass
...
Now that the declaration function is out of the way, the tracing pass,
which is very long and 100% the same can be shared between pixel and
vertex shaders.
The new function is called shader_trace_init(), and is responsible for:
- tracing the shader
- initializing the function length
- setting the shader version [needed very early]
2006-06-13 11:40:22 +02:00
9bae7755ab
wined3d: Rework dcl processing.
...
The new function is called in pass 2 (getister counting/maps), and
it's now in baseshader. It operates on all INPUT and OUTPUT registers,
which, in addition to the old vertex shader input declarations covers
Shader Model 3.0 vshader output and pshader input declarations. The
result is stored into the reg_map structure.
2006-06-13 11:40:21 +02:00
f144d58ac2
wined3d: The namedArrays code path is dead (always FALSE).
...
Delete the entire namedArrays code path and all its dependencies (one
of which is quite long - storeOrder in drawprim is always FALSE, for
example). Delete declaredArrays, and make its code path the default.
2006-06-13 11:40:21 +02:00
c6449b5a91
wined3d: Move a checkGLcall to it's gl call inside an "if".
2006-06-13 10:51:07 +02:00
7528fc0de1
wined3d: Fix stencil related render states.
2006-06-13 10:50:55 +02:00
cf8833c467
wined3d: Enable two sided stencil in the caps.
2006-06-13 10:46:29 +02:00
df3e078b20
wined3d: Also print the format like a fourcc if unknown in debug_d3dformat.
2006-06-13 10:35:14 +02:00
405e11ea62
wined3d: Cleanup GetSrcAndOpFromValue().
...
- Cleanup GetSrcAndOpFromValue().
- Use naming more consistent with the rest of the file.
2006-06-12 16:07:58 +02:00
d822496dee
wined3d: Map D3DSIO_DEF to it's GLSL generating function for vertex shaders.
2006-06-12 13:21:46 +02:00
dbfb3739aa
wined3d: Make all the local shader functions static.
2006-06-10 13:22:27 +02:00
e9cbc66e93
wined3d: Make the virtual table functions static where possible.
2006-06-10 13:15:32 +02:00
42dd4653e3
wined3d: Change fog output variable name for GLSL shaders.
2006-06-10 12:43:10 +02:00
e8c97e9421
wined3d: Fix regression from register maps switch for ARB shaders.
...
I missed a register mask in the move to share the shader_hw_def()
function between pixel and vertex shaders for ARB shaders. Fixed
that, and made the GLSL version use the same mask for consistency.
2006-06-10 12:43:02 +02:00
a09c941677
wined3d: Enable CND/CMP for SHADER_ARB.
2006-06-10 12:42:09 +02:00
621f075fb9
wined3d: Print out sampler state names.
2006-06-10 12:41:54 +02:00
d44d0b5edb
wined3d: Downgrade Get*Shader FIXME to TRACE.
2006-06-10 12:41:44 +02:00
08295f4cfc
wined3d: GLSL shader cleanup patch.
...
- Based on comments from H. Verbeet
- Changed the distinction from .rgba & .xyzw masks to only use .xyzw
in GLSL shaders. They are interchangeable, and only served to make
the trace look more intuitive, but they don't always apply as-is, so
we'll just leave everything to .xyzw.
- Got rid of the "UseProgramObjectARB(0)" call in drawprim. If there
is no shader set on the next primitive, then that primitive will
call UseProgramObjectARB(0) when it begins to draw.
2006-06-09 21:09:03 +02:00
d5d4568450
wined3d: Allow drawPrim to create and use the GLSL program.
2006-06-09 15:20:06 +02:00
b67cda248d
wined3d: Add GLSL helper functions to Device.
...
- Add functions to attach & detach shader objects, create and delete programs, and maintain the list of programs.
- Add a list of GLSL shader programs to the device which is initialized on Init3D(), and deleted on Release().
2006-06-09 15:19:52 +02:00
ca7976c34f
wined3d: Map vertex shader instructions to GLSL generating functions.
2006-06-09 15:19:09 +02:00
5798356d21
wined3d: Map pixel shader instructions to GLSL generating functions.
2006-06-09 15:19:02 +02:00
d59714b78c
wined3d: Prototype the GLSL functions for use with pixel and vertex shaders.
2006-06-09 15:14:34 +02:00
806aaa1287
wined3d: Added more declarations to GLSL.
...
- Declare more variable names for GLSL programs.
- Some of these won't need to be declared eventually, but it doesn't hurt to do it for now.
- Correct output name for pixel shaders (gl_FragColor instead of glFragColor).
2006-06-09 15:14:22 +02:00
ca70d13af4
wined3d: Unified float constant register mapping between ARB pixel and vertex shaders.
...
- Got rid of the separate constant maps.
- Side effect of this is that the map is a bit larger for pixel shaders than it needs to be
2006-06-09 14:36:50 +02:00
0c59ca6448
wined3d: Add the bulk of the GLSL string generation functions.
...
- Add a new file glsl_shader.c which contains almost every GLSL specific function we'll need
- Move print_glsl_info() into glsl_shader.c
- Move the shader_reg_maps struct info into the private header, and make it part of SHADER_OPCODE_ARG.
- Create a new shared ps/vs register map for float constants (future patch will make ARB programs use this, too)
2006-06-09 13:47:55 +02:00
1f1057fc9b
wined3d: Move constant loading out of DrawPrimDrawStrided() and enable
...
loading float constants for GLSL.
- DrawPrim is just too big of a function. This separates the passing
of constants to the shader into new functions.
- Fixes an off-by-one error when loading vertex declaration constants
(should be <, not <=)
- Adds a function for GLSL loading of constants (aka Uniforms)
- Adds a GLSL program variable to the stateblock and sets it to 0 (a
future patch will actually create this program)
2006-06-09 13:26:51 +02:00
ac46320f57
wined3d: TEXREG2GB is valid on pshaders 1.1.
2006-06-07 15:23:23 +02:00
83a9666f9c
wined3d: Fix NULL dereference in generator function.
2006-06-07 15:23:17 +02:00
4d66615bbb
wined3d: Fix missing light recording.
...
Write a light with the default parameters in disabled state if
capturing a missing light.
2006-06-07 15:20:00 +02:00
26978a4d2d
wined3d: Return the result of QueryInterface in GetContainer.
2006-06-07 11:48:00 +02:00
7b8bf46f3f
wined3d: Remove a redundant break.
2006-06-07 11:47:54 +02:00
85ec834f7a
wined3d: Don't hardcode type sizes for shader constants.
2006-06-07 11:47:46 +02:00
5f5969b3c5
wined3d: Remove constant type field in stateblock.
...
It is wrong to maintain a mapping from a constant index to a type
field, because different constant types do not share an index -
boolean constant 0 is supposed to co-exist with floating point
constant 0, not replace it. Drawprim and other code using the type
array to decide whether to look up a constant in bools, floats, or
ints is wrong - you can't make that decision based on the index.
2006-06-06 11:58:54 +02:00
0909df6711
wined3d: Rename vertex shader constants.
...
From const%lu to C%lu for consistency (to match pshaders).
2006-06-06 11:50:36 +02:00
79029c1099
wined3d: Add limits for ps_2_x.
2006-06-06 11:50:20 +02:00
aec2e3e46d
wined3d: Trace improvements.
2006-06-06 11:49:03 +02:00
2c232990ee
wined3d: pshader defi has 5 parameters.
2006-06-06 11:48:48 +02:00
2c3adec595
wined3d: Render target locking fixes.
2006-06-05 20:59:41 +02:00
5de8cd3bd6
wined3d: Adjust the video mem when dropping the pow2 size in GDISurface.
2006-06-01 11:44:38 +02:00
93fd4c12f8
wined3d: Properly destroy texture object if we failed to create its surfaces.
2006-05-30 12:34:26 +02:00
ebcef4a5f6
wined3d: Do not disable GL_BLEND when alpha blending is active.
2006-05-30 12:23:18 +02:00
21218c8587
wined3d: Release the memory in IWineGDISurface::PrivateSetup before calling GetDC.
2006-05-30 12:23:07 +02:00
473ce80fa2
wined3d: Add ability to generate GLSL shader objects for vertex and pixel shaders.
2006-05-27 11:01:05 +02:00
0161d6b636
wined3d: Final move of the GLSL registry check (hopefully).
2006-05-27 10:57:32 +02:00
34a959c6eb
wined3d: Implement IWineD3DSurface::BltFast.
2006-05-26 20:29:48 +02:00
9d5849d9bd
wined3d: Fix IWineGDISurface::SaveSnapshot.
2006-05-26 20:15:35 +02:00
0ce3cb2379
wined3d: Disable the depth test in UnlockRect
2006-05-26 20:14:38 +02:00
c60f296b70
wined3d: Fix regression introduced by recent multitexture patch.
2006-05-26 20:14:31 +02:00
cef19b5769
wined3d: Move the GLSL registry check again.
2006-05-26 11:56:11 +02:00
163ee76592
wined3d: Shader caps fix - code relocation.
2006-05-25 20:17:45 +02:00
54e5f9c465
wined3d: Dynamicly load GL_ARB_multitexture functions.
2006-05-25 20:17:32 +02:00
5b8b776431
wined3d: Small rhw vertex fix.
...
Fix the one pixel displacement and move the glOrtho code in a common
function.
2006-05-25 20:09:57 +02:00
e8d4c2e674
wined3d: Fixed a compiler warning.
2006-05-25 11:09:46 +02:00
d5f95961f1
wined3d: Fog fixes.
2006-05-25 10:36:40 +02:00
40d3cc5ee4
wined3d: Turn around the image in LockRect.
2006-05-25 10:35:58 +02:00
e18c89b3f4
wined3d: Silence the offscreen surface creation fixme.
2006-05-25 10:35:10 +02:00
93db443319
wined3d: Color keying emulation.
2006-05-25 10:34:53 +02:00
e902cd119f
wined3d: Swapchain and back buffer corrections + tests.
2006-05-24 13:56:55 +02:00
9c018fd877
wined3d: Fix ARB_imaging abuse.
2006-05-24 10:52:28 +02:00
63199ca022
wined3d: Fixed a couple of boolean comparisons against TRUE.
2006-05-24 10:46:06 +02:00
d204540d1f
wined3d: Replaced USING_GLSL define with a new wined3d_settings option based on the registry.
2006-05-24 10:40:35 +02:00
a67488a26e
wined3d: Add function to print the infolog of a GLSL shader on errors.
...
With assistance from H. Verbeet.
2006-05-24 10:37:33 +02:00
29a8dd47a8
wined3d: Remove a double cap flag.
2006-05-24 10:03:34 +02:00
89ca7fffd4
wined3d: Remove an unnecessary NULL check.
2006-05-24 10:03:28 +02:00
a55da88d0b
wined3d: Do not addref a NULL backbuffer in IWineD3DSwapChain::GetBackBuffer.
2006-05-23 17:52:06 +02:00
360a3f9142
Update the address of the Free Software Foundation.
2006-05-23 14:11:13 +02:00
158691ea3b
wined3d: OpengGL accelerated blits.
...
Implement some basic opengl accelerated blts from and to render
targets. It's not perfect yet, but enought to make some D3D apps
happy. For now the only supported operations are:
- Full screen back -> Front buffer: Just call present
- Offscreen surface -> render target
- Render target -> offscreen surface(slow)
- render target colorfill
2006-05-23 12:41:31 +02:00
9d75802a21
wined3d: Surface pixel format conversion code.
2006-05-23 12:37:27 +02:00
7b861b3c03
wined3d: Simplify input/output modifier line handling.
2006-05-22 11:41:23 +02:00
cb973648ab
wined3d: Clean up register use maps.
2006-05-22 11:40:38 +02:00
d59eeb3ee5
wined3d: Allow use of pixel shaders with drawStridedSlow.
2006-05-22 11:40:00 +02:00
438d88e1e8
wined3d: Only run parse_decl_usage on vshader INPUT registers.
2006-05-22 11:38:55 +02:00
4a1375bdd6
wined3d: Simplify generate_base_shader() when checking for USING_GLSL usage.
2006-05-20 17:38:09 +02:00
683e5bfc55
wined3d: Move PARAM C[] program.env[] into baseshader and out of vertex shaders.
2006-05-20 17:37:48 +02:00
cfcdb6515b
wined3d: Sort of oversized surface support.
2006-05-20 14:06:09 +02:00
672fa65334
wined3d: Add more device caps.
2006-05-20 14:05:38 +02:00
ebcbda72c4
wined3d: Allow SYSTEMMEM textures and surfaces.
2006-05-20 14:05:23 +02:00
566cdcf55c
wined3d: Implement IWineD3DDevice::SetDisplayMode.
2006-05-20 14:05:06 +02:00
df3902e6c1
wined3d: Trace output corrections and cleanups.
2006-05-20 13:58:31 +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
fa62d9d3b4
wined3d: Parameter trace corrections.
2006-05-18 10:32:22 +02:00
3d905baf50
wined3d: SETP takes 3 parameters.
2006-05-18 10:32:08 +02:00
c65a86828c
wined3d: Use COLOROUT/DEPTHOUT for pixel shaders 2.0+.
...
As previously mentioned, RASTOUT is invalid on pixel shaders.
On shaders 1.x, r0 is treated as the color output register:
http://www.gamedev.net/columns/hardcore/dxshader3/page2.asp
That's what we currently do in all cases, change it not to do so
for shaders >= 2.0. Support COLOROUT/DEPTHOUT instead.
2006-05-17 10:56:25 +02:00
174734e4a2
wined3d: LRP is not a valid ARBvp code.
2006-05-17 10:56:01 +02:00
8470e54bdf
wined3d: Remove detailed traces from map2gl/input_modifiers functions.
2006-05-17 10:55:50 +02:00
c05bc5d9c1
wined3d: Write "unrecognized_register" in fallback case for get_register_name().
2006-05-17 10:55:39 +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
53d240a3e0
wined3d: Do not rely on num_params to skip unhandled tokens in shaders 2.0.
2006-05-17 10:52:37 +02:00
d4dd9869b8
wined3d: Allow multiple output modifiers.
2006-05-17 10:51:47 +02:00
c94ecdff61
wined3d: Fix SINCOS parameters.
...
SINCOS has 4 parameters in shaders 2.0.
It has 2 parameters in shaders 3.0.
It's undefined in shaders 1.0.
2006-05-17 10:50:33 +02:00
6b5d076394
wined3d: DEFI takes 5 parameters.
...
According the spec and the Painkiller log, DEFI has 5 parameters on
vertex shaders.
2006-05-17 10:50:10 +02:00
ba438d4f5d
wined3d: Correctly define the number of possible parameters.
2006-05-16 12:53:28 +02:00
f7d89201c1
wined3d: Unset the ddraw primary when it is released.
2006-05-16 12:42:12 +02:00
2a35f769e3
wined3d: Add missing render states to the dumping function.
2006-05-16 12:41:51 +02:00
7cd41b944b
wined3d: Implement IWineD3DDevice::SetFrontBackBuffers.
2006-05-16 12:41:41 +02:00
8b7401c39a
wined3d: Shaders: share dump_param function, version functions.
2006-05-15 16:07:31 +02:00
7757d7bc5c
wined3d: Fix incorrect sizeof.
2006-05-15 16:04:07 +02:00
f7c24f37ad
Various trace fixes.
...
Add trailing '\n's to trace calls.
Remove spaces before '\n'.
2006-05-15 15:05:09 +02:00
e739ba9551
Assorted spelling fixes.
2006-05-15 15:05:05 +02:00
eaec7793d5
wined3d: Avoid a NULL dereference in RealizePalette.
2006-05-15 14:03:06 +02:00
34b1482fdc
wined3d: Render state additions and fixes.
2006-05-15 14:02:57 +02:00
8af7dd5dea
wined3d: Nonpow2 repacking support for GetDC.
2006-05-15 14:02:37 +02:00
daa6a3d714
wined3d: Support for single buffering.
2006-05-15 14:02:18 +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
b2d96086e5
wined3d: Set pIndexData to 0 in DrawIndexedPrimitiveUP.
2006-05-11 12:11:55 +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
68f75555d3
wined3d: Use GenerateShader in pixel shaders and remove old function.
2006-05-10 12:19:42 +02:00
087c67c459
wined3d: Add GenerateShader function to pixel shaders.
2006-05-10 12:19:19 +02:00
604579ed62
wined3d: Use new GenerateShader function for vertex shaders.
2006-05-10 12:19:01 +02:00
36b0b9cc1c
wined3d: Added new GenerateShader function for Vertex Shaders & declare generate_base_shader().
2006-05-10 12:18:08 +02:00
d982954808
wined3d: Created generate_base_shader which will be shared by pixel & vertex shaders.
2006-05-10 12:17:18 +02:00
c15447d4b0
wined3d: Rename the TEMP variables in vertexshader.c to R from T for consistency.
2006-05-10 12:17:01 +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
f015124ae0
wined3d: Move D3DSIO_M#x# vertex shader opcodes to a more standard function.
2006-05-10 12:15:35 +02:00
eee6fc9277
wined3d: Move DCL, DEF operations out of Generate loop and into separate functions.
2006-05-10 12:15:12 +02:00
5308e026d1
wined3d: Move program_dump_decl_usage into baseshader.
2006-05-10 12:14:39 +02:00
a87520036f
janitorial: Remove redundant NULL pointer checks before HeapFree'ing them.
...
Some HeapFree's are hidden behind macros. Found by smatch.
2006-05-10 11:31:41 +02:00
9d4960bfcb
wined3d: Clean up some dead code.
2006-05-10 11:29:44 +02:00
b187242ab6
wined3d: Break out texture instruction processing.
2006-05-10 11:28:49 +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
aadafd64da
wined3d: Make register counting pass the same.
2006-05-10 11:24:33 +02:00
7e12e2ac5b
wined3d: Update the DIB section's palette on GetDC.
2006-05-10 11:23:22 +02:00
d89080c671
wined3d: Update the device palette if the primary palette is changed.
2006-05-10 11:23:08 +02:00
275a0c2f2d
wined3d: Implement WineD3DSurface palette methods.
2006-05-10 11:22:20 +02:00
f8e8646fcc
wined3d: Implement GetFlipStatus and GetBltStatus.
2006-05-10 11:22:01 +02:00
cd05f9c10c
wined3d: Implement IWineD3DSurface::Flip.
2006-05-10 11:21:38 +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
9413c89c33
wined3d: Add check for GL Shading Language 100 Extension.
2006-05-09 12:39:24 +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
80dc1f9cb3
wined3d: Fix possible buffer overflow.
...
Increase size of passed buffer to print into.
2006-05-08 15:26:55 +02:00
66ab457196
wined3d: Eliminate duplicate function: vshader_program_dump_param().
2006-05-08 15:19:12 +02:00
4b3079438b
wined3d: Share get_register_code().
2006-05-08 15:15:30 +02:00
18e95ee969
wined3d: Add IWineD3DSurface::GetPitch.
2006-05-08 14:52:18 +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
aea0b5d0f8
wined3d: Separate pshader/vshader tables.
2006-05-08 13:36:31 +02:00
dbf5450982
wined3d: Remove dead shader code.
2006-05-07 10:00:24 +02:00
07f4f70487
wined3d: QueryInterface corrections.
2006-05-05 20:23:41 +02:00
c4eff1eb44
wined3d: Vertex Shader regtype cleanups.
2006-05-05 18:01:09 +02:00
1e86752812
wined3d: Fix mipmap level count.
2006-04-21 11:35:49 +02:00
744f3ae1c4
wined3d: Improve/implement D3DSIO_TEX.
...
- unify per-version cases into a single sequence
- make use of get_register_name() for the destination register
- ignore destination write mask - it's only allowed on 2.0+ shaders,
and only the default mask is allowed there (xyzw)
- enable swizzle on texld 1.4 (it works together with dw/dz modifiers)
- implement for shaders 2.0-3.0
2006-04-21 11:35:34 +02:00
ecba4d5cbd
wined3d: Texture format corrections.
...
- add missing GL type and make GL cfg entries for A16B16G16R16
- correct L16 type to UNSIGNED_SHORT (..16 = short, not byte)
- change internal format for X8R8G8B8 from GL_RGB to GL_RGB8 which
seems more correct
2006-04-21 11:35:06 +02:00
74117baa6c
wined3d: Correct vtrace usage.
2006-04-21 11:34:31 +02:00
a6f71af021
wined3d: Implement IWineD3DPalette.
2006-04-21 11:28:11 +02:00
63ef9788dd
wined3d: Trace corrections/improvements.
2006-04-20 15:38:00 +02:00
162d9cb6f4
wined3d: Support for shift modifiers.
2006-04-19 19:27:22 +02:00
70fc78b64e
wined3d: Support more than 4/6 tex/temp registers.
2006-04-19 19:26:50 +02:00
04da3ce2d1
wined3d: Implement GetHWND and SetHWND.
2006-04-19 12:55:03 +02:00
7fee88df9f
wined3d: Implement EnumTextureFormats.
2006-04-19 12:54:32 +02:00
ac964c3b61
wined3d: Implement EnumZBufferFormats.
2006-04-19 12:54:08 +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
3dddaae795
wined3d: Use ARB[f|v]p1.0 for ps2/ps3/vs3.
2006-04-18 11:22:48 +02:00
e3c8e65084
wined3d: Use correct register number mask.
...
The regmask currently being used is wrong - 0x1FFF includes the high
two bits of the register type.
2006-04-18 11:20:45 +02:00
e0a1442f6c
wined3d: Dcl opcode takes 2 parameters.
2006-04-18 11:19:48 +02:00
7e5f734ee3
wined3d: Fix _dw modifier.
...
The _dw modifier needs to specify a component swizzle, just like the
_dz currently does.
2006-04-18 11:19:13 +02:00
d3d56e765d
wined3d: Fix flow control instructions number of parameters.
...
- else, endif, break take 0 parameters [not 2]
- if, rep take 1 parameter [not 2]
- breakp takes 1 parameter [not 2]
- move all flow control instructions in one place
- sync software shaders signatures with this
2006-04-18 11:18:48 +02:00
0d6eaf363d
wined3d: Skip unhandled opcodes in vshaders.
2006-04-18 11:17:34 +02:00
d486b93e30
wined3d: Texkill is supported for ps2.0-3.0.
2006-04-18 11:17:12 +02:00
42b9221f51
wined3d: Add the remaining DirectDraw methods to WineD3DSurface.
2006-04-18 11:14:13 +02:00
80bdb24cad
wined3d: Add the remaining IWineD3DDevice methods.
2006-04-18 11:13:47 +02:00
cff4e1ea4b
wined3d: Add IWineD3DPalette.
2006-04-18 11:11:49 +02:00
03b256b16d
wined3d: Add a parameter for surface type selection.
2006-04-18 11:09:17 +02:00
076fa811af
wined3d: Add a method to change the front and back buffers.
2006-04-17 11:21:22 +02:00
ffc8e46e76
wined3d: Add IWineD3DSurface::Blt.
2006-04-17 11:19:30 +02:00
4f986c842f
wined3d: Fix null pointer check in IWineD3DImpl_GetPixelShader.
2006-04-14 19:36:48 +02:00
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
d3c33dc018
Correct the matrix sizes in software shaders and remove an erroneous
...
parameter from lrp.
2005-11-28 10:39:48 +01:00
0ec7e1a591
Renamed all .cvsignore files to .gitignore.
2005-11-26 13:10:33 +01:00
6d442aeb34
Assorted spelling fixes.
2005-11-23 20:14:43 +01:00
30ad95b6cd
Corrects an error in the _m3xm3 shader function in pixel and vertex
...
shaders.
2005-11-22 15:01:55 +00: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
da29023d7a
Clear the z and stencil buffers at the end of the scene, this fixes a
...
problem with the solid node bsp demo from www.codesampler.com as well
as a lot of blank screens in some other demos.
2005-11-17 11:05:12 +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
f4c0524ec6
Assorted spelling and case fixes.
2005-11-10 11:39:07 +00:00
c4569d9298
Define GL_EXT_framebuffer_object and GL_EXT_pixelbuffer_object openGL
...
specs.
Support Mesa GL_VERSION on parse.
2005-11-10 11:04:59 +00:00
2e9bff702c
Fix parsing of version number.
2005-11-08 12:47:04 +00:00
f4e290ff46
Fixed an error in Swapchain_GetFrontBufferData.
2005-11-08 10:55:49 +00:00
c62e978d54
Verify that the texture coordinate used in DrawStridedSlow is in range
...
before trying to referencing the associated data.
2005-11-07 11:13:26 +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
473cac840b
Correct the number of parameters expected for the LRP function.
2005-10-27 10:23:53 +00:00
483320c484
Changed the way that 24bit and 32bit Adapter and Buffer formats are
...
reported allowing EVE online to get past the startup screen and
allowing the Fur demo (amongst others) to run in a window, as under
windows, instead of in fullscreen mode.
2005-10-12 21:07:27 +00:00
44b4777972
Add checks for ARB_vertex_program before allowing vertex shaders to
...
use ARB_vertex_program.
2005-10-11 20:27:54 +00:00
0fbf69fcf8
Report unrecognized opcodes as FIXMEs instead of TRACEs so that they
...
are easier to spot and fix.
2005-10-10 19:52:49 +00:00
80c60f5bad
Provide looser device matching for backbuffer and depth buffer
...
formats. It should allow some games and applications to run without X
being in the correct backbuffer format (e.g. 16 bit games will run
with a 24bit X backbuffer).
2005-10-04 15:50:57 +00:00
0a7de6a758
Use correct minLookup[] array entry.
2005-10-03 10:15:08 +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
7e22be4d84
We are no longer generating .dbg.c files.
2005-09-29 10:35:58 +00:00
effc262f9f
Added support for backbuffer with the formats A1R5G5B5 and X1R5G5B5.
2005-09-29 10:31:43 +00:00
b3563daca2
Implement state tracking for pixel shader constants.
2005-09-28 10:13:00 +00:00
c99a3fafef
Change the format of surface_SaveSnapshot to TGA from PPM and add
...
support for compressed textures and an alpha channel.
2005-09-27 10:49:59 +00:00
2b8a7dca38
Correct a problem with locking nonpower 2 back and front buffers.
2005-09-27 09:32:29 +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
b7603859f3
Return the adaptor mode as X8R8G8B8 when BPP is 24 or 32 bits.
2005-09-19 15:25:07 +00:00
4752553d57
Prevent CheckDepthStencilMatch from causing problems if there is a
...
current active OpenGL context.
2005-09-19 14:31:21 +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
c6b005ac69
Fixed some more traces to use the right printf format and avoid
...
typecasts.
2005-09-12 14:12:46 +00:00
13fc2f88d6
Added A2R10G10B10 and D3DFMT_D24FS8 modes to all other functions.
2005-09-07 09:25:26 +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
52a63149dc
Change SetDirty in texture to pass the value of dirty instead of
...
always passing TRUE.
2005-08-27 09:23:06 +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
0e0ff51842
Update the implementation of GetFrontBufferData in stateblock.
2005-08-23 19:59:27 +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
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
Stefan Dösinger