Commit Graph

1248 Commits

Author SHA1 Message Date
Alistair Leslie-Hughes 42fcc1f9f8 d3dx9_36: Move functions D3DXDebugMute, D3DXGetDriverLevel to utils.c.
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-06-17 22:56:58 +09:00
Matteo Bruni 3054c0fd1b d3dx9: Fix a couple of stub signatures in the spec files.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-17 00:09:19 +09:00
Paul Gofman cd024a263f d3dx9: Improve performance and memory usage in preshader constants setting.
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-06-15 17:11:52 +09:00
Matteo Bruni c614f0b1b4 d3dx9: Turn an ERR into a WARN.
It can potentially happen if the application passes broken effect data.

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-06-15 17:11:52 +09:00
Andrey Gusev d8641197c0 d3dx9_36: Fix typos in comments.
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-06-03 23:31:03 +09:00
Paul Gofman 571119a585 d3dx9/tests: Add test for IsParameterUsed 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-05-31 11:31:29 +09:00
Paul Gofman fe1a89d14f d3dx9: Implement IsParameterUsed function 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-05-31 11:31:26 +09:00
Paul Gofman dca016d7dc d3dx9: Add is_param_type_sampler() helper 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-05-27 00:14:41 +09:00
Paul Gofman 4786f53ef8 d3dx9: Add d3ds_dotswiz opcode to preshader.
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-05-27 00:10:04 +09:00
Paul Gofman be4c5f5022 d3dx9/tests: Extend effect preshader test.
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-05-20 12:52:59 +09:00
Paul Gofman a5fcc4d2a2 d3dx9: Add test for 0 * INF preshader operation.
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-05-04 01:03:30 +09:00
Paul Gofman 2925d6e6ec d3dx9: Add 'exp' preshader opcode.
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-05-04 01:03:30 +09:00
Francois Gouget fcf0829b60 d3dx9_36/tests: Spelling fixes for mesh and xfile ok() messages.
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-05-02 12:27:35 +09:00
Paul Gofman ab78cffea7 d3dx9/tests: Add test for D3DXSHMultiply3 arguments aliasing.
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-04-19 23:29:47 +09:00
Paul Gofman dd79394ccc d3dx9: D3DXQuaternionSquadSetup should support arguments aliasing.
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-04-19 23:29:31 +09:00
Paul Gofman 453d9f7bce d3dx9: Implement setting named shader constants 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-04-19 23:29:25 +09:00
Matteo Bruni 9d725b1778 d3dx9: Free old object data when reusing effect object.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 13:44:51 +09:00
Matteo Bruni e7021c6a03 d3dx9: Don't complain when overwriting effect object id 0.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-18 15:07:10 +09:00
Francois Gouget a6745afc54 d3dx9_36/tests: Fix an unknown spelling error in the shader tests.
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-04-18 15:06:44 +09:00
Paul Gofman 61b09f3fc7 d3dx9: Add test for D3DXVec2TransformCoord arguments aliasing.
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-04-18 15:06:14 +09:00
Paul Gofman bb9a2e6714 d3dx9: D3DXVec2Transform should support arguments aliasing.
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-04-18 15:06:12 +09:00
Paul Gofman a67b43c1be d3dx9: Get rid of redundant temporary variable in D3DXQuaternionInverse.
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-04-18 15:06:09 +09:00
Paul Gofman 97bbf747c0 d3dx9: Add test for D3DXPlaneFromPointNormal arguments aliasing.
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-04-18 15:06:07 +09:00
Paul Gofman 4620bb80b0 d3dx9: Implement array selectors 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-04-18 15:05:30 +09:00
Paul Gofman 58d80d90a5 d3dx9: Add basic opcodes to preshader.
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-04-18 15:05:23 +09:00
Paul Gofman 43208b6348 d3dx9: Implement fxlc constants (expressions) 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-04-18 15:05:15 +09:00
Paul Gofman 1ba9cfb5c3 d3dx9: D3DXVec3Transform should support input and output parameter overlap.
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-04-14 13:13:55 +09:00
Paul Gofman b76ee0c7f8 d3dx9: Implement preshaders disassembly dump.
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-04-07 00:59:56 +09:00
Paul Gofman 9b3e942ffc d3dx9: Implement preshader parsing.
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-04-07 00:59:56 +09:00
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