Paul Gofman
8eeeb4d1e1
d3dx9: Introduce preshaders in effect.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-29 10:36:47 +09:00
Józef Kucia
eb7fc363f8
d3dx9: Avoid '\n' in middle of TRACE() message.
...
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-28 16:26:50 +09:00
Francois Gouget
f030fbe0a2
d3dx9_36: Make d3dx_set_shader_const_state() static.
...
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-23 11:28:55 +09:00
Paul Gofman
ad7ec2ec14
d3dx9: Add test for preshader in effect.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-23 11:28:54 +09:00
Francois Gouget
8fda75fe4a
d3dx9/tests: Add a trailing '\n' to an ok() call.
...
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-18 22:20:01 +09:00
Matteo Bruni
4d1192ad89
d3dx9: Cleanup header includes.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 14:12:29 +09:00
Paul Gofman
fda55a3fdf
d3dx9: Fix D3DXIntersectTri function.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-15 12:26:10 +09:00
Henri Verbeet
a9506bf952
d3dx9/tests: Get rid of some redundant NULL checks in D3DXCreateTextTest().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-13 15:41:48 +09:00
Henri Verbeet
d708f309c8
d3dx9/tests: Get rid of a redundant NULL check in test_effect_states().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-13 15:41:45 +09:00
Henri Verbeet
20f7abf667
d3dx9: "param" should never be NULL in free_parameter().
...
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-13 15:41:41 +09:00
Paul Gofman
1da5af9364
d3dx9: Support setting texture through SetValue in effect.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-09 18:40:34 +09:00
Matteo Bruni
9bfacd24d2
d3dx9: Trace the parameter passed to IsParameterUsed().
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:13:16 +09:00
Paul Gofman
ea13805e83
d3dx9: IsParameterUsed stub should return TRUE.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-08 11:13:10 +09:00
Michael Stefaniuc
bb79ca5b54
d3dx9/tests: Use SetRectEmpty() instead of open coding it.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:42:05 +09:00
Michael Stefaniuc
46b6f60de1
d3dx9/tests: Avoid using an empty rect for a test.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 18:41:57 +09:00
Paul Gofman
afcb6dc891
d3dx9: Implement CommitChanges in effect.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:36 +09:00
Paul Gofman
c1487eee3e
d3dx9: Implement state save and restore in effect.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:33 +09:00
Paul Gofman
3aa22f47a8
d3dx9: Implement sampler and texture effect states application.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:31 +09:00
Paul Gofman
ec6124f15d
d3dx9: Implement shader constants effect states application.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:28 +09:00
Paul Gofman
6df87a6647
d3dx9: Implement light and material effect states application.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:25 +09:00
Paul Gofman
91c5f11537
d3dx9: Implement simple effect states application.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:22 +09:00
Paul Gofman
6a5a4f9b12
d3dx9: Add test for basic effect state management.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-04 11:35:17 +09:00
Michael Stefaniuc
020b86b0be
d3dx9/tests: Avoid a TRUE:FALSE conditional expression.
...
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 12:05:57 +09:00
Frédéric Delanoy
2d9659d311
d3dx9/tests: Use todo_wine_if() in tests.
...
Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-03-01 12:05:57 +09:00
Paul Gofman
215e2d7fed
d3dx9: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters.
...
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-25 23:52:23 +09:00
Paul Gofman
546c55a09d
d3dx9: Don't pass usage flags when creating temporary texture
...
Some usage flags require D3DPOOL_DEFAULT (and not D3DPOOL_SYSTEMMEM),
and the usage of texture being created is overall not related to
intermediate buffer texture usage. If texture being created has
D3DUSAGE_AUTOGENMIPMAP, updating it from non autogenerated mipmap should
be fine according to MSDN (IDirect3DDevice9::UpdateTexture).
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-02-25 23:24:14 +09:00
Andrey Gusev
37cbe0b882
d3dx9: Fix a typo.
...
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-26 14:48:25 +09:00
Nikolay Sivov
7b38f20458
d3dx9/tests: Fix some test failures.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-20 14:49:10 +09:00
Alistair Leslie-Hughes
2b0278c703
d3dx9/tests: DDS magic isn't part of the DDS header.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-18 14:08:44 +09:00
Alistair Leslie-Hughes
6097695d4b
d3dx9/tests: Add D3DXCreateAnimationController tests.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-18 14:08:41 +09:00
Alistair Leslie-Hughes
94cc44883f
d3dx9: Implement GetMaxNum* functions.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-18 14:08:39 +09:00
Christian Costa
16eaf69526
d3dx9: Implement D3DXCreateAnimationController with a stubbed ID3DXAnimationController interface.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-18 14:08:33 +09:00
Christian Costa
d2307b1ffc
d3dx9: Improve generated DDS file header.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-08 21:37:32 +09:00
Alistair Leslie-Hughes
54ebbfdc63
d3dx9/tests: Add D3DXSaveSurfaceToFileInMemory DDS header tests.
...
Also update the structure dds_header to be the same as d3dx9_36/surface.c.
Use (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA) with a todo.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-08 21:37:20 +09:00
Alistair Leslie-Hughes
af4ece26d2
d3dx9: Add D3DXConvertMeshSubsetToSingleStrip stub.
...
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-01-05 11:52:04 +01:00
Matteo Bruni
d71970f658
d3dx9: Don't take the fastpath when converting between texture formats of different type.
...
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-30 23:16:49 +09:00
Nikolay Sivov
236d97fed9
d3dx9: Use proper enum member (Clang).
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-27 20:53:31 +09:00
Stefan Dösinger
1e78257109
d3dx9_36: Replace powf(2, unsigned int) with (1u << unsigned int).
...
Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-25 12:57:29 +09:00
Marcus Meissner
d17341dbd0
d3dx9_36: Remove unneeded vertex_remap variable (Coverity).
...
Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-04 14:41:38 +09:00
Alistair Leslie-Hughes
418a7c6c73
d3dx9: Don't always fail if an ID3DXAnimationController pointer is passed to D3DXLoadMeshHierarchyFromXInMemory.
...
D3DXLoadMeshHierarchyFromXInMemory will only return an AnimationController
when the xfile has an AnimationSet.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-03 21:49:21 +09:00
Nikolay Sivov
67738a41c4
d3dx9_36/tests: Use proper printf format (PVS-Studio).
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-28 22:31:31 +09:00
Gediminas Jakutis
329fb2f728
d3dx9: Add adjacency generation for D3DXCreateCylinder().
...
Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-27 21:42:14 +09:00
Frédéric Delanoy
3cdea7e50e
d3dx9_36: Simplify conditional expression (PVS-Studio).
...
Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-16 13:22:45 +09:00
Andrey Gusev
d3177504b1
Assorted spelling and typos fixes.
2015-08-31 20:18:46 +09:00
Józef Kucia
ece3af7855
d3dx9: Use D3DFMT constants instead of MAKEFOURCC codes.
2015-08-25 16:57:55 +09:00
Józef Kucia
520deb14d2
d3dx9/tests: Add tests for DDS file format size validation.
2015-08-25 16:57:55 +09:00
Józef Kucia
853be6e1d8
d3dx9: Fix miplevels handling for DDS file format.
2015-08-25 16:57:55 +09:00
Józef Kucia
ba53012fcf
d3dx9: Fix typo in DDS_WIDTH define.
2015-08-25 16:57:55 +09:00
Józef Kucia
a0a8556fd1
d3dx9/tests: Fix HFONT leaks.
2015-08-07 23:50:49 +09:00
Józef Kucia
567ab59c79
d3dx9: Correctly handle whitespace character in D3DXCreateText.
2015-08-07 23:50:48 +09:00