Matteo Bruni
8bed853c43
d3dx9: Fix argument type in convert_dib_to_bmp().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-04 17:24:14 +02:00
Vijay Kiran Kamuju
70d722340a
d3dx9: Generate ID3DXSkinInfo in D3DXLoadSkinMeshFromXof() when needed.
...
Based on a patch by Michael Müller.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33904
Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-04 17:24:14 +02:00
Christian Costa
a30fd8c0e4
d3dx9/tests: Add tests for 32 bpp BMP with alpha.
...
Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-04 17:24:14 +02:00
Matteo Bruni
ccdb74d81a
d3dx9/tests: Avoid a test failure on Vista testbot.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-04 17:24:14 +02:00
Matteo Bruni
5c052b699e
d3dx9/tests: Improve D3DXMatrixInverse() test a tiny bit.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-27 09:24:28 +01:00
Michael Müller
aec8e12a3d
d3dx9/tests: Add initial tests for dummy skin info interface.
...
Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-27 09:24:28 +01:00
Matteo Bruni
c9c74b8b10
include: Fix D3DXF_FILELOADMEMORY definition.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-27 09:24:28 +01:00
Michael Stefaniuc
cd3e5020e4
d3dx9: Secure against unsafe iface to COM object transitions.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-22 19:53:04 +01:00
Michael Stefaniuc
3b951b77f8
d3dx9: Get rid of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-22 19:53:02 +01:00
Michael Stefaniuc
7f16670edc
d3dx9: Move flags out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-22 19:52:59 +01:00
Michael Stefaniuc
c56906599c
d3dx9: Avoid using This in d3dx_effect_Clone().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-22 19:52:57 +01:00
Michael Stefaniuc
ef974e5985
d3dx9: Merge the two pool fields of struct d3dx_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-22 19:52:55 +01:00
Michael Stefaniuc
3bd0fc3d6a
d3dx9: Avoid using 'This' in d3dx_effect_GetPool().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-22 19:52:53 +01:00
Matteo Bruni
9a121f5115
d3dx9: Simplify effect init.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 22:57:51 +01:00
Matteo Bruni
009279845d
d3dx9: Simplify effect cleanup.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 22:57:51 +01:00
Michael Stefaniuc
5fa06bbc30
d3dx9: Move techniques out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 19:32:52 +01:00
Michael Stefaniuc
4c134a66b0
d3dx9: Move parameters out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 19:32:49 +01:00
Michael Stefaniuc
9438d03127
d3dx9: Use get_version_counter_ptr() instead of open coding it.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 19:32:47 +01:00
Michael Stefaniuc
074e3232ee
d3dx9: Move technique_count out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 19:32:45 +01:00
Michael Stefaniuc
92d2f6d994
d3dx9: Pass a struct d3dx_effect to d3dx9_create_object().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 19:32:43 +01:00
Michael Stefaniuc
de59a12971
d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-21 19:32:41 +01:00
Michael Stefaniuc
baf4aaa359
d3dx9: Don't expose struct d3dx9_base_effect outside effect.c.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-19 18:31:38 +01:00
Michael Stefaniuc
09770370c0
d3dx9: Pass a struct d3dx_effect to get_parameter_element_by_name().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-19 18:31:36 +01:00
Michael Stefaniuc
0c63453229
d3dx9: Move full_name_tmp_size out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-19 18:31:33 +01:00
Michael Stefaniuc
3779ff07b0
d3dx9: Move full_name_tmp out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-19 18:31:31 +01:00
Michael Stefaniuc
adc1b5a8bc
d3dx9: Move param_tree out of struct d3dx9_base_effect.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-19 18:31:28 +01:00
Matteo Bruni
cffe35488d
d3dx9: Avoid double free on effect initialization failure.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:43:11 +01:00
Michael Stefaniuc
2f16d2f4ca
d3dx9: Pass a struct d3dx_effect to d3dx9_base_effect_cleanup().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:35 +01:00
Michael Stefaniuc
7738fec56b
d3dx9: Pass a struct d3dx_effect to get_annotation_by_name().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:33 +01:00
Michael Stefaniuc
62a26e1ad0
d3dx9: Pass a struct d3dx_effect to add_param_to_tree().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:31 +01:00
Michael Stefaniuc
f9351bae3e
d3dx9: Pass a struct d3dx_effect to the version helpers.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:28 +01:00
Michael Stefaniuc
956b30dbf3
d3dx9: Pass a struct d3dx_effect to get_valid_pass().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:26 +01:00
Michael Stefaniuc
6ecc2c51b3
d3dx9: Pass a struct d3dx_effect to get_valid_parameter().
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:24 +01:00
Michael Stefaniuc
73a05456bf
d3dx9: Merge the d3dx_effect_GetVertexShader() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-18 21:41:21 +01:00
Michael Stefaniuc
a4ea70af14
d3dx9: Merge the d3dx_effect_SetVectorArray() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-15 20:00:31 +01:00
Michael Stefaniuc
6eb69d2cf6
d3dx9: Merge the d3dx_effect_SetVector() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-15 20:00:29 +01:00
Michael Stefaniuc
4d978ec081
d3dx9: Merge the d3dx_effect_GetVectorArray() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-15 20:00:27 +01:00
Michael Stefaniuc
3754ba683f
d3dx9: Merge the d3dx_effect_GetVector() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-15 20:00:25 +01:00
Michael Stefaniuc
bd731f6dd1
d3dx9: Merge the d3dx_effect_SetValue() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-15 20:00:20 +01:00
Michael Stefaniuc
d4e39ee1d8
d3dx9: Merge the d3dx_effect_GetValue() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-15 20:00:17 +01:00
Michael Stefaniuc
918c13f48c
d3dx9: Merge the d3dx_effect_SetTexture() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-14 23:52:59 +01:00
Michael Stefaniuc
f06d6ab085
d3dx9: Merge the d3dx_effect_GetTexture() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-14 23:52:59 +01:00
Michael Stefaniuc
e288158dec
d3dx9: Merge the d3dx_effect_SetString() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-14 23:52:59 +01:00
Michael Stefaniuc
ea45ed1751
d3dx9: Merge the d3dx_effect_GetString() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-14 23:52:59 +01:00
Michael Stefaniuc
7ce336969c
d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-14 23:52:59 +01:00
Michael Stefaniuc
262238d467
d3dx9: Merge the d3dx_effect_GetParameterDesc() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-14 23:52:59 +01:00
Michael Stefaniuc
f34f13825f
d3dx9: Merge the d3dx_effect_SetMatrixTransposePointerArray() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-12 22:03:46 +01:00
Michael Stefaniuc
9f1ed4fcdd
d3dx9: Merge the d3dx_effect_SetMatrixTransposeArray() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-12 22:03:44 +01:00
Michael Stefaniuc
81203bdb04
d3dx9: Merge the d3dx_effect_SetMatrixTranspose() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-12 22:03:41 +01:00
Michael Stefaniuc
95a8cfad14
d3dx9: Merge the d3dx_effect_GetMatrixTransposePointerArray() helper.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-12 22:03:39 +01:00