Commit graph

1748 commits

Author SHA1 Message Date
Nikolay Sivov 95bbaa6210 d3dx9/effect: Split parameters data from effect object.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
2022-12-01 20:36:05 +01:00
Nikolay Sivov 26e1293db6 d3dx9/preshader: Handle input register table. 2022-12-01 20:36:05 +01:00
Eric Pouech c85141bcae d3dx9_36/tests: Use correct integral type.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
2022-11-16 21:24:19 +01:00
Eric Pouech 8c7ffd677e d3dx9_36/tests: Introduce union to help passing float values in DWORD.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
2022-11-16 21:24:19 +01:00
Alex Henrie 0587b71773 d3dx9/tests: Use standard C functions for memory allocation in mesh.c. 2022-11-16 14:22:28 +01:00
Nikolay Sivov f63f0d3b2b d3dx9: Add missing path conversion call in D3DXLoadVolumeFromFileA(). 2022-11-15 21:21:27 +01:00
Matteo Bruni 24a4b8caf1 d3dx9: Build without -DWINE_NO_LONG_TYPES.
Based on a patch by Eric Pouech.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-05-20 16:51:02 +02:00
Matteo Bruni 29a84c9c33 d3dx9/xfile: Don't unnecessarily use long integer type.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-05-20 16:51:00 +02:00
Matteo Bruni 90b0ef658c d3dx9/shader: Use more proper integer types.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-05-17 11:43:37 +02:00
Matteo Bruni b6b6561aa3 d3dx9/mesh: Split skin header and weights parse functions.
They don't really share any code in common.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-05-17 11:43:34 +02:00
Matteo Bruni 8537db0239 d3dx9/mesh: Make use of more proper types.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-05-17 11:43:32 +02:00
Matteo Bruni 0c7090a1da d3dx9/tests: Test D3DXAssembleShader() with both terminated and not terminated include data.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-05-17 11:43:26 +02:00
Eric Pouech fc67b16803 d3dx9: Use correct integral type.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-04-27 11:55:27 +02:00
Matteo Bruni 71091ed5d9 d3dx9/effect: Return a uint32_t from the bytecode read helper.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-04-27 11:55:20 +02:00
Eric Pouech 5fe1c2db00 d3dx9/effect: Return the read value from read_dword().
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-04-27 11:55:10 +02:00
Matteo Bruni 9cb65cb025 d3dx9/tests: Increase tolerance in a quaternion test.
It currently fails for me on 32-bit Linux.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-03-28 22:21:47 +02:00
Matteo Bruni 9400874e3c d3dcompiler: Always use vkd3d-shader's preprocessor.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-03-28 22:21:47 +02:00
Matteo Bruni 8956862e0a d3dx9/tests: Fix tests broken by using the HLSL compiler from vkd3d-shader.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52721
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-03-28 22:21:47 +02:00
Matteo Bruni 67f6073b9e d3dx9: Handle D3DXCONSTTABLE_LARGEADDRESSAWARE flag.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-18 22:10:47 +01:00
Matteo Bruni 514bac00cc d3dx9: Build with nameless unions.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-18 22:10:47 +01:00
Matteo Bruni 6cf61d4239 d3dx9/tests: Get rid of unnecessary ifs.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-18 22:10:47 +01:00
Matteo Bruni e1463532be d3dx9/tests: Initialize an input variable.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-18 22:10:47 +01:00
Matteo Bruni dbfd33e501 d3dx9/tests: Fix initialization of texture levels > 0 in test_D3DXSHProjectCubeMap().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52561
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-18 22:10:47 +01:00
Zebediah Figura cfb1d2058f d3dx9: Implement ID3DXEffect::CloneEffect().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44635
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-14 21:47:00 +01:00
Zebediah Figura aff66846dd d3dx9/tests: Add more tests for ID3DXEffect::CloneEffect().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-14 21:46:52 +01:00
Zebediah Figura f170677724 d3dx9: Separate out d3dx9_effect_init_from_dxbc().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-14 21:46:49 +01:00
Zebediah Figura 8c40c413b9 d3dx9: Do not use d3dx_effect_cleanup() in D3DXCreateEffectEx().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-14 21:46:46 +01:00
Zebediah Figura ffc4d9b84c d3dx9/tests: Test setting annotation values.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-09 18:37:33 +01:00
Zebediah Figura 47351a609d d3dx9: Don't mark annotation variables as dirty.
This fixes a crash when trying to set their value.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-09 18:37:33 +01:00
Zebediah Figura b3b6d8c99e d3dx9: Pass the "flags" argument to D3DXFXCreateEffectEx() as compiler flags, not effect flags.
And strip D3DXFX_* creation flags from them.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-09 18:37:33 +01:00
Zebediah Figura b6062279b8 d3dx9: Return D3DERR_INVALIDCALL from ID3DXEffect::BeginPass() if the effect is not started.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-09 18:37:33 +01:00
Zebediah Figura d049e5dc1c d3dx9: Implement D3DXSHProjectCubeMap().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-02-07 20:23:35 +01:00
Alexandre Julliard f0cd33c69e include: Add support for defining Win32 types as 'long' where possible.
Add -DWINE_NO_LONG_TYPES to modules that still have compilation
warnings with long types.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-01-27 20:38:22 +01:00
Fabian Maurer fc503ab07d d3dx9_36/tests: Avoid "misleading indentation" warnings.
Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-01-26 21:53:47 +01:00
Alex Henrie 4dd6408e89 d3dx9_36/tests: Add missing call to ID3DXSprite_End.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2022-01-07 16:19:23 +01:00
Christian Costa 46f08b169b d3dx9: Also check for a valid alpha channel for TGA images.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48631
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-12-10 22:00:18 +01:00
Matteo Bruni cee2d4c4c9 d3dx9/tests: Clean up test_update_semantics() a bit.
Inspired by a patch from Eric Pouech <eric.pouech@gmail.com>.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-11-22 22:20:50 +01:00
Matteo Bruni 71c6f5b1ca d3dx9/tests: Clean up GetMatrixTransposePointerArray() tests.
Inspired by a patch from Eric Pouech <eric.pouech@gmail.com>.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-11-22 22:20:50 +01:00
Nikolay Sivov db1361ebb0 d3dx9/tests: Add some tests for constant descriptions in texture shaders.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-27 11:36:10 +02:00
Nikolay Sivov e3d42ca303 d3dx9: Implement ID3DXTextureShader::GetFunction().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-15 18:31:38 +02:00
Matteo Bruni 3660176e09 d3dx9/tests: Clean up GetMatrixPointerArray() tests.
Inspired by a patch from Eric Pouech.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-10-06 22:27:36 +02:00
Eric Pouech 70c51f89bd d3dx9/tests: Fix use of D3DXVec2Normalize().
Spotted by GCC 11.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-30 21:24:38 +02:00
Eric Pouech 46b33179c2 d3dx9: Fix use of D3DXVec2Normalize().
Spotted by GCC 11.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-30 21:24:34 +02:00
Alexandre Julliard 088a787a2c makefiles: Make -mno-cygwin the default.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-09-20 22:45:48 +02:00
Nikolay Sivov 4ad4e4a133 d3dx9: Forward D3DXDisassembleShader() to d3dcompiler.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-27 18:06:30 +02:00
Nikolay Sivov 60a3e01062 d3dx9/effect: Reset output handle for next after last technique in FindNextValidTechnique().
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-17 23:09:05 +02:00
Nikolay Sivov ebb99bde64 d3dx9: Implement getting/setting line width.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-08-11 23:00:50 +02:00
Connor McAdams cd0e0bbcf7 d3dx9: Remove unnecessary call to D3DXMatrixTranspose.
Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-06-11 18:45:44 +02:00
Zebediah Figura 0d075b904b d3dx9/tests: Remove the fallback NAN definition.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-03-05 17:56:02 +01:00
Alexandre Julliard 64bdb9808f d3dx9: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2021-02-22 14:42:08 +01:00