d7f94bf7c9
wined3d: Correctly draw transformed and untransformed vertices in the same scene.
2006-08-22 12:53:53 +02:00
a39e2b51cb
wined3d: Don't pass bad values to glAlphaFunc and glDepthFunc.
2006-08-21 12:23:41 +02:00
4c88bb84b9
wined3d: Print real unhandled D3DCMPFUNC value.
2006-08-21 12:23:02 +02:00
de97fa7a3b
wined3d: Better GPU detection.
2006-08-21 12:21:19 +02:00
09eb0c40a6
wined3d: Improve float constant loading a bit.
...
- Use a list to keep track of what constants are set.
- Move TRACEs and checkGLcall calls out of the main constant loading loop.
2006-08-21 12:17:42 +02:00
49f4c68e29
wined3d: Lookup GLSL float uniform locations only once per program.
2006-08-21 12:16:27 +02:00
efa5f78598
wined3d: Free the float constant map arrays for all stateblocks.
2006-08-21 12:16:06 +02:00
2358fbbb03
wined3d: Fix indices for the float constant map.
...
Indices for the float constant map should be multiplied by 4 because
we're loading 4 component float vectors, not because the size of a
float is 4.
2006-08-21 12:15:12 +02:00
f50bb771c9
wined3d: Make sure b_info structure is properly allocated and released.
2006-08-17 11:20:33 +02:00
ce5c4d38c4
wined3d: Silence WINED3DRS_DEBUGMONITORTOKEN.
2006-08-16 16:43:32 +02:00
ef1c8fd118
wined3d: Fix vertex shader corruption issue.
2006-08-14 11:45:33 +02:00
1a3359884c
wined3d: Fix opengl extension call.
2006-08-11 11:56:36 +02:00
387c982d5c
wined3d: Fix spelling in a comment.
2006-08-11 11:55:27 +02:00
2628627e79
wined3d: Surface pitch fix.
2006-08-10 10:54:59 +02:00
31abc2febd
wined3d: Draw buffers support.
2006-08-10 10:54:50 +02:00
30ef7f0b08
wined3d: Minor cursor fixes.
2006-08-10 10:54:37 +02:00
c2b6cc9dc4
wined3d: Fix GLSL regression / draw buffers support.
2006-08-09 20:35:59 +02:00
bfbcfd2234
wined3d: Watch out for negative results when validating the shader constant range.
2006-08-09 20:35:02 +02:00
c856432fab
wined3d: Volume texture addressing caps.
2006-08-08 19:37:30 +02:00
eba1f90ef6
wined3d: Shader declaration cap fixes.
2006-08-08 19:37:23 +02:00
194cdfa4b0
wined3d: Shader cap fixes.
2006-08-08 19:35:24 +02:00
ccf0d11352
wined3d: Stub out remaining renderstates.
2006-08-08 11:21:17 +02:00
f5d9b221cf
wined3d: Correct check for GL ext. support in MULTISAMPLEANTIALIAS.
2006-08-08 11:21:10 +02:00
f02af24039
wined3d: Add missing newline at the end of traces.
2006-08-08 11:20:15 +02:00
4d6cfb6351
wined3d: Registry setting for the amount of simulated texture memory.
...
Set VideoMemorySize under HKCU\Software\Wine\Direct3D to amount in MB
as string.
2006-08-08 11:20:05 +02:00
91998b4d99
wined3d: Textureops caps fix.
2006-08-08 11:15:07 +02:00
3d2ae69102
wined3d: Allow async occlusion queries.
2006-08-07 19:59:49 +02:00
008c23d06a
wined3d: Improve a few query traces.
...
The query type is useful to have in query TRACEs.
IWineD3DQueryImpl_GetDataSize isn't really a stub.
2006-08-07 19:42:54 +02:00
44c1747f71
wined3d: Check Occlusion query GL calls.
2006-08-07 19:42:39 +02:00
02a8f74490
wined3d: Add a couple of traces to the vertexdeclaration creation code.
2006-08-07 19:42:31 +02:00
ce9b4baad8
Assorted spelling fixes.
2006-08-07 13:52:55 +02:00
930a9a1d02
wined3d: texture caps fixes.
2006-08-07 13:52:38 +02:00
bd6f0b23d6
wined3d: General constant caps fix.
2006-08-07 13:52:03 +02:00
219ca7c2a0
wined3d: Fix D3DCOLOR swizzling in shaders.
2006-08-07 13:12:21 +02:00
ef87a40c72
wined3d: Delay vertex shader compilation until the shader is first used.
2006-08-07 13:12:10 +02:00
3d9e96f3bc
wined3d: Volume textures fix.
2006-08-05 11:26:25 +02:00
6ded5542b2
wined3d: Raster caps fix.
2006-08-05 11:26:06 +02:00
6fedd6c041
wined3d: Primitive misc caps fix.
2006-08-05 11:25:51 +02:00
9925b0561e
wined3d: Basetexture anisotropic fix.
2006-08-04 20:48:08 +02:00
95b047c2fe
wined3d: Fix a number of badly reported caps.
2006-08-04 20:47:50 +02:00
a7c2ab3e90
wined3d: Surface pitch fix.
2006-08-04 11:59:00 +02:00
ea905eab09
wined3d: Disable vertex arrays after we're done drawing from them.
...
After drawing from a vertex array we should disable them, to prevent
the next draw calls from potentially reading past their ends. This
also moves the disabling of vertex attrib arrays (for shaders) into
its own function.
2006-08-04 11:58:43 +02:00
c0c525d458
wined3d: Paletted texture support.
2006-08-03 18:20:37 +02:00
13557abb7f
wined3d: Fix potential NULL dereference in IWineD3DSurfaceImpl_LockRect.
2006-07-31 17:20:15 +02:00
92bc96a96b
wined3d: Avoid NULL dereference.
2006-07-31 17:20:05 +02:00
d5238cfb38
wined3d: Split the GLSL check in a check for GLSL vertex shaders and one for GLSL fragment shaders.
2006-07-31 10:53:05 +02:00
c6c6cf1f51
wined3d: Improve IWineD3DDeviceImpl_CreateTexture trace.
2006-07-31 10:53:00 +02:00
56395ca5f3
wined3d: Use GL_LIMITS(samplers) instead of GL_LIMITS(sampler_stages) in IWineD3DSurfaceImpl_UnlockRect.
2006-07-31 10:52:55 +02:00
e5fc18a505
wined3d: Skip processing of D3DSIO_PHASE instruction.
2006-07-29 11:50:10 +02:00
2e52b36bb3
wined3d: Declare a 1D sampler for TEXDP3TEX (GLSL).
2006-07-29 11:50:02 +02:00
d353ab7879
wined3d: Start checking for D3DUSAGE_QUERY_* items, improve traces.
2006-07-29 11:49:51 +02:00
dc743d82ff
wined3d: Optimize d3dfmt_convert_surface.
2006-07-29 11:49:03 +02:00
72bfe131d1
wined3d: More shader fixes / new instructions.
...
- Replace gl_FragColor with gl_FragData[0] for GLSL pixel shader output.
- Subtract 1 more constant from total GLSL allowed float constants to
accommodate the PROJECTION matrix row that we reference.
2006-07-28 14:01:16 +02:00
6d16eff9a6
wined3d: Render target texturing.
2006-07-28 14:01:07 +02:00
65e5ed60ae
wined3d: Do not use the IWineD3DSurface for the cursor.
2006-07-28 12:31:57 +02:00
0fbc1fc0df
wined3d: Avoid a false ERR.
2006-07-28 12:28:19 +02:00
0312a30676
wined3d: Fix minor typo from shader patch.
2006-07-27 14:40:01 +02:00
46c4b88ba5
wined3d: Fix some upside-down rendering issues for shaders.
2006-07-27 12:03:25 +02:00
3127d6401a
wined3d: BltFast/BltOverride color keying.
2006-07-27 12:02:16 +02:00
3588067b90
wined3d: Blacklist WINED3DFMT_R8G8B8.
2006-07-27 11:57:45 +02:00
de051649c3
wined3d: Fix CopyRects if pDestPointsArray is NULL.
2006-07-26 15:40:39 +02:00
3b10a021db
wined3d: More efficient color keying dirtifying.
...
Instead of blindly dirtifying the surface LoadTexture keeps track of
the color key that was used when creating the opengl texture and
reloads the surface if the color key has changed.
2006-07-26 15:21:00 +02:00
06106e2810
ddraw: Support using an application-provided surface pointer.
2006-07-26 15:17:59 +02:00
a5142837c6
wined3d: Enable all bump mapping formats.
2006-07-26 10:24:37 +02:00
f6b88b93ad
wined3d: Fix crash caused by bad TRACE.
2006-07-26 10:24:27 +02:00
5ca9f82661
wined3d: Remove superfluous breaks.
2006-07-26 10:24:15 +02:00
7e90aba97b
wined3d: Implement more GLSL instructions.
...
Implement D3DSIO_TEXREG2AR, TEXREG2GB, TEXREG2RGB, TEXM3X3TEX, TEXM3X3SPEC.
2006-07-25 11:22:55 +02:00
536638918d
wined3d: Add real occlusion query support.
2006-07-25 11:22:00 +02:00
8c981140a2
wined3d: Add traces to IWineD3DVertexShaderImpl_SetFunction & IWineD3DPixelShaderImpl_SetFunction.
2006-07-25 11:21:51 +02:00
2d6e661fbe
wined3d: D3d8 shaders can have a NULL pFunction, but a valid vertex declaration.
2006-07-25 11:21:46 +02:00
ac8f2c033c
wined3d: Improve traces for D3DTRANSFORMSTATETYPE.
...
Added debug function for WINED3DTRANSFORMSTATETYPE and changed all
references from D3DTS_* to WINED3DTS_*.
2006-07-24 19:55:27 +02:00
a98ccb543d
wined3d: Draw the cursor.
2006-07-24 13:27:15 +02:00
14c2aa0ed6
wined3d: Use the ddraw blitting code for IWineD3DDevice::ColorFill.
2006-07-24 13:27:15 +02:00
75950b5bf8
wined3d: Replace memset/memcpy routines on stateblock (fixes dynamic shader constants regression).
2006-07-24 12:57:34 +02:00
127613bc6f
wined3d: Whitelist pixelformats instead of blacklisting.
2006-07-24 12:57:34 +02:00
a64febd3d1
wined3d: Reactivate the X bits fixup.
2006-07-24 12:57:33 +02:00
3c03ae2f84
wined3d: Minor trace corrections in Set___ShaderConstants().
2006-07-21 20:22:19 +02:00
9423fd2d9f
wined3d: Do not try to create a vbo more than once.
2006-07-21 20:21:00 +02:00
d637aa3581
wined3d: Move vertex fixups into their own function.
2006-07-21 20:20:54 +02:00
99f67c676b
wined3d: Respect EnableAutoDepthStencil parameter.
2006-07-21 10:54:43 +02:00
99272f0dee
wined3d: Correct initial render states.
2006-07-21 10:54:12 +02:00
65109002ae
wined3d: Do not return WINED3DERR_INVALIDCALL for Phong shading.
2006-07-21 10:53:54 +02:00
0c6c9f04a7
wined3d: Restore recording mode later in ActiveRender().
2006-07-21 10:53:34 +02:00
b77b72c91b
wined3d: Read shader constants from correct stateblock.
2006-07-21 10:53:01 +02:00
a8f2c1075a
wined3d: Compilation fixes.
2006-07-20 12:11:06 +02:00
718716b77a
wined3d: Make the number of floating point shader constants dynamic.
2006-07-19 09:54:30 +02:00
bffe5a6922
ddraw/wined3d: Remove texture format enumeration functions.
2006-07-18 11:25:22 +02:00
9740555d83
wined3d: Duplicate flips in software if the local copy is up to date.
2006-07-18 11:24:51 +02:00
9a9a14d4f5
wined3d: Disable the fog before writing the back buffer data.
2006-07-18 11:24:08 +02:00
739d565c59
wined3d: Add a setting for the render target locking method.
2006-07-18 11:22:51 +02:00
f8ca32b3fb
wined3d: Break the glDrawPixels call out of UnlockRect.
2006-07-18 11:22:09 +02:00
2dc451e181
wined3d: Readd missing copyright to shaders files.
2006-07-18 11:10:34 +02:00
95ac88cc0b
wined3d: Fix typo in ARB pixel shader.
2006-07-18 11:10:23 +02:00
593541a50c
wined3d: Increment texture_idx when continuing as well.
2006-07-18 11:09:46 +02:00
6a97f2202e
wined3d: Fix for vertex shaders.
2006-07-17 15:05:38 +02:00
ecbb53a723
wined3d: Break out the frame buffer readback of LockRect, implement palettized readback.
2006-07-17 15:05:38 +02:00
5702a310e9
wined3d: Allocate 4 extra bytes in the dib section.
2006-07-17 13:51:12 +02:00
494841d3e5
wined3d: Only copy memory corresponding to the dib section instead of the power of 2 surface.
2006-07-14 13:32:40 +02:00
436d700c2e
wined3d: Fix cmp instruction for GLSL.
...
The current GLSL cmp instruction is incorrect, because:
- it ignores destination write mask
- it ignores source swizzle
- it ignores other source modifiers.
- it works incorrectly for src0 = 0
2006-07-14 13:32:38 +02:00
07eb6531a3
wined3d: Fix light state bugs.
2006-07-14 12:39:13 +02:00
0924f969d1
wined3d: Texture stages that reference NULL textures should just pass
...
through the result of the previous stage.
2006-07-12 13:21:04 +02:00
7090259545
wined3d: Fix specular color handling for register combiners.
...
By default the FinalCombiner is setup to add the specular color to the
final result of the combiner operations. However, it should only do
this when the WINED3DRS_SPECULARENABLE renderstate is enabled.
2006-07-12 13:20:41 +02:00
0dd13f2cb7
wined3d: Check the color data type too when deciding whether to convert data.
2006-07-12 13:20:25 +02:00
ed9848930b
wined3d: Improve GetAdapterMonitor stub.
2006-07-11 17:14:46 +02:00
33293df143
wined3d: More flow control instructions.
...
- Implement call, callnz, label, and ret
- Implement support for NOT modifier
2006-07-11 17:14:24 +02:00
6ede56495a
wined3d: More flow control instructions
...
- Implement if, else, endif, rep, endrep, break
- Implement ifc, breakc, using undocumented comparison bits in the instruction token
- Fix bug in main loop processing of codes with no dst token
- Fix bug in GLSL output modifier processing of codes with no dst token
- Fix bug in loop implementation (src1 contains the integer data, src0 is aL)
- Add versioning for all the instructions above, and remove
GLSL_REQUIRED thing, which is useless and should be removed from all
opcodes in general.
2006-07-11 17:13:05 +02:00
345dd49eda
wined3d: Fix off-by-one constants bug.
2006-07-11 17:12:24 +02:00
8068fc3b9c
wined3d: Clamp texcoord output between 0 and 1.
2006-07-11 17:12:04 +02:00
e9de563e41
wined3d: Place immediate constants in the same array as global constants.
...
- move DEF, DEFI, DEFB handling into the register counting pass
- keep track of defined constants as a linked list (because there's a
few of them)
- apply immediate constants after global constants in the constant
loading function
- both types of constants now get loaded with array notation in the
shader (into the same array)
2006-07-11 17:11:30 +02:00
2ce792fd33
wined3d: Add an "\n" to a fixme to fix another overflow (in IWineD3DImpl_CheckDeviceFormatConversion).
2006-07-11 12:41:29 +02:00
5258e061dc
make_dlls: Ignore generated import libraries from the top-level .gitignore.
2006-07-10 20:55:58 +02:00
cc2b3b48e6
Take advantage of the recursive nature of .gitignore for Makefile entries.
...
Prefix other entries with '/' to make them non-recursive.
2006-07-10 20:47:54 +02:00
c58e06548e
wined3d: Fix typo breaking 3.0 pshaders color input.
2006-07-10 11:48:11 +02:00
eb527c82e2
Add a common fps counter channel to ddraw, opengl and d3d.
2006-07-07 17:52:46 +02:00
5638fac685
wined3d: Trace ABS/ABSNEG modifiers.
2006-07-07 17:40:03 +02:00
899c8cdb64
wined3d: Create fake input semantics for d3d8 shaders.
...
Use them to remove the need for loading arrays in two different places.
2006-07-07 17:39:52 +02:00
5b3c500efe
wined3d: Reverse semantics maps for shaders.
2006-07-07 17:39:26 +02:00
c611012df5
wined3d: Make WINED3D_ATR macros more flexible.
...
Make them operate on a type, as opposed to a semantic name.
2006-07-07 17:37:25 +02:00
c202bfe40d
wined3d: Simplify primitiveDeclartationConvertToStrided.
...
Assign fixed indices to declaration inputs.
Then use a common path to load the strided data.
2006-07-07 17:36:24 +02:00
85aa8ab855
wined3d: Add position_transformed flag to Strided data format.
2006-07-07 17:35:36 +02:00
fc2611d4a8
wined3d: Only link and use GLSL program if at least one GLSL shader is available.
2006-07-07 17:28:21 +02:00
c562c4c771
wined3d: Fix D3DSIO_TEXKILL for GLSL.
2006-07-07 16:57:51 +02:00
00e779370f
janitorial: Put "inline static" at the beginning of a declaration.
2006-07-07 14:30:35 +02:00
32b1a24501
janitorial: Move the storage specifier to the beginning of the declaration.
2006-07-07 14:30:35 +02:00
3529e0ceeb
wined3d: Fix D3DSIO_M#X# instruction for both ARB and GLSL shaders.
...
This instruction was being handled incorrectly in the case where the
2nd src argument contained a relatively addressed constant.
2006-07-06 16:31:24 +02:00
0472e9cd49
wined3d: Clean up drawPrimitive/drawPrimitiveDrawStrided.
2006-07-06 16:07:38 +02:00
1309844913
wined3d: Implement FVF to DECL9 conversion (with tests).
2006-07-06 16:07:38 +02:00
276609e1e5
wined3d: Move register count pass to SetFunction.
...
Move semantics pointers out of the reg_maps, make them persistent data
in the shader (again, for future software shaders).
2006-07-06 16:07:38 +02:00
bbe7b40a71
wined3d: Fix STREAM flag override.
2006-07-06 16:07:38 +02:00
e260e9fd98
wined3d: Add missing PSIZE register for decl8->9 conversion.
2006-07-06 16:07:38 +02:00
b324fc0fdb
wined3d: Allow mix of SW vertex and GLSL pixel shader.
...
Do not attach non-GLSL shaders to the GLSL program, that will cause a
crash. Mix with ARB shaders is never going to happen, because the
selection code will always choose GLSL for both or ARB for both.
2006-07-06 16:07:37 +02:00
771623692e
wined3d: Rework shader mode selection.
...
- currently half the shader selection code (GLSL vs ARB) is in
fillGLcaps. The parts that check for software shaders are in
GetDeviceCaps. That placement, will work, but is definitely not optimal.
FillGLcaps should detect support - it should not make decision as to
what's used, because that's not what the purpose of the function is.
GetDeviceCaps should report support as it has already been selected.
Instead, select shader mode in its own function, called in the
appropriate places.
- unifying pixel and vertex shaders into a single selection is a
mistake. A software vertex shader can be coupled with a hardware arb or
glsl pixel shader, or no shader at all. Split them back into two and add
a SHADER_NONE variant.
- drawprim is doing support checks for ARB_PROGRAM, and making shader
decisions based on that - that's wrong, support has already been
checked, and decided upon, and shaders can be implemented via software,
ARB_PROGRAm or GLSL, so that support check isn't valid.
- Store the shader selected mode into the shader itself. Different types
of shaders can be combined, so this is an improvement. In fact, storing
the mode into the settings globally is a mistake as well - it should be
done per device, since different cards have different capabilities.
2006-07-06 16:07:37 +02:00
1a82976908
wined3d: Flip WINED3DFMT_R8G8B8 to GL_RGB.
2006-07-06 12:45:27 +02:00
7e9fd0b4c1
wined3d: Add a function to print out D3DDECLUSAGE9 values.
2006-07-03 12:04:37 +02:00
0111e15e1f
wined3d: Fix faulty DCL trace.
2006-07-03 12:04:23 +02:00
1bfec25031
wined3d: Resync ARB mnxn function with GLSL mnxn function.
2006-07-03 12:04:09 +02:00
fd896d8652
wined3d: Use shader_get_regtype() in register counting pass.
2006-07-03 12:03:58 +02:00
d06e13db99
wined3d: Move SHADER_ARB code into arb_program_shader.c.
2006-07-03 12:03:31 +02:00
fce0c625f0
wined3d: Cleanup: print constants in device code.
2006-07-03 12:02:04 +02:00
77448f588b
wined3d: Perform sanity checks on the rectangle in LockRect.
2006-06-30 20:44:27 +02:00
4fbe97e5e7
wined3d: Fix a few GLSL shader instruction translations.
...
This fixes the translations for a few instructions in GLSL and allows
Cubemap sampling in pixel shaders < 2.0. It makes some of the
lighting on textures in Half Life 2 look better, including some of the
water effects. It's not perfect yet, but much closer now.
2006-06-29 14:41:01 +02:00
7f9e61f7d2
wined3d: Use register combiners for texture stage operations.
...
Make wined3d use register combiners for texture stage operations. In
order to do that the texture unit index needs to be separated from the
texture stage index. For cards that don't support the
NV_register_combiners extension nothing should change.
2006-06-28 16:34:36 +02:00
f3a2a9f30a
wined3d: Add code for using register combiners for texture stage operations.
...
On nVidia cards the value of GL_MAX_TEXTURE_UNITS is generally not
larger than 4. In Direct3D that would correspond to
MaxSimultaneousTextures in the caps, rather than MaxTextureBlendStages
(which can be much larger) to which it currently corresponds in
wined3d. Using register combiners we can get around that limitation
and get up to GL_MAX_GENERAL_COMBINERS_NV (typically 8) texture
stages. This patch adds code for doing the texture operations with
register combiners instead of ARB_texture_env_combine or
NV_texture_env_combine4, but doesn't make use of that code yet. That's
what the next patch will do.
2006-06-28 16:08:36 +02:00
ac98d566ac
wined3d: Fix uploading of textures for shaders.
...
The code for uploading / binding textures for use with pixel shaders
is slightly different from the one for uploading / binding textures
for use with the fixed function pipeline. It would be possible to keep
the code in a single function with a couple of conditionals, but in
combination with the changes needed for register combiners that would
become quite messy.
2006-06-28 16:08:17 +02:00
a54e36adfe
wined3d: Texture limits fixes.
...
GL_LIMITS(textures) is currently used for both the number of texture
stages and the maximum number of simultaneous textures. In the current
code that's the same, but in a later patch that will be separated,
since a texture stage doesn't have to reference an actual
texture. Also, shaders can access a larger number of samplers than the
number of texture units the fixed function pipeline can access.
2006-06-28 16:06:25 +02:00
085e20c0da
wined3d: Add & use D3DTEXTUREOP dumping code.
2006-06-28 15:43:53 +02:00
cea41b0a0f
wined3d: Vertex buffer can be locked multiple times.
2006-06-27 21:14:02 +02:00
baf38b3007
wined3d: Implement more GLSL instructions and a little cleanup.
...
- Implement D3DSIO_DP2ADD, D3DSIO_TEXKILL, D3DSIO_TEXM3X3PAD
- Partially implement D3DSIO_TEXBEM, D3DSIO_TEXM3X3VSPEC (as much as
they are implemented in ARB_fragment_program at least).
- Stop copying the SHADER_PARSE_STATE struct in each ARB shader
routine - use a pointer instead.
2006-06-27 11:16:10 +02:00
3489f1b9b1
wined3d: Remove some redundant code.
2006-06-27 11:15:54 +02:00
f460b38612
wined3d: Fix compilation (VBO constants).
2006-06-27 11:15:47 +02:00
Stefan Dösinger