Commit Graph

1244 Commits

Author SHA1 Message Date
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
Józef Kucia 9361832863 d3dx9/tests: Add tests for normals computation. 2015-07-31 12:06:12 +02:00
Józef Kucia 8eca2df900 d3dx9: Implement D3DXComputeNormals(). 2015-07-31 12:06:04 +02:00
Józef Kucia 4346b79c2f d3dx9: Partially implement D3DXComputeTangentFrameEx(). 2015-07-31 12:05:57 +02:00
Józef Kucia 55ef5afbda d3dx9/tests: Use new_test_context() to create device in mesh tests. 2015-07-31 12:05:37 +02:00
Alistair Leslie-Hughes d55fe1f9ce d3dx9_36: Add D3DXCreateFragmentLinker, D3DXCreateFragmentLinkerEx stubs. 2015-07-31 12:05:14 +02:00
Alistair Leslie-Hughes 0bd896f0f8 d3dx9_36: Add D3DXTessellateNPatches stub ( try 2). 2015-07-31 12:04:44 +02:00
Christian Costa b82fab89a1 d3dx9_36: Add stub for D3DXIntersect. 2015-07-21 16:33:24 +02:00
Christian Costa 05390ccc65 d3dx9_36: Add stub for D3DXComputeTangentFrameEx. 2015-07-21 16:33:23 +02:00
Stefan Dösinger 7109bebd02 wined3d: Move volume DXTn handling to apply_format_fixups. 2015-04-27 15:07:42 +09:00
Andrey Gusev 07630a9eae d3dx9_36: Assorted spelling and typos fixes. 2015-03-31 00:04:42 +09:00
Francois Gouget 3266ff8ab2 d3dx9_36: Make d3dx_decltype_size[] static. 2015-03-17 14:18:35 +09:00
Francois Gouget f572279576 d3dx9_36: Remove unneeded NONAMELESSXXX directives. 2015-03-06 12:54:01 +09:00
Christian Costa 27c72ae986 d3dx9_36: Fix d3dx9_skin_info_ConvertToIndexedBlendedMesh stub. 2015-03-05 21:41:58 +09:00
Austin English c19876ed4e d3dx9_36: Add D3DXDisassembleShader stub. 2015-02-16 23:22:04 +09:00
Michael Stefaniuc ceef3a844a d3dx9_36/tests: Actually test retrieve_device_state calls (PVS-Studio). 2015-01-13 19:54:03 +01:00
Alistair Leslie-Hughes e5d7982c4d d3dx9: Make ID3DXFont_PreloadCharacters return S_OK. 2014-12-12 11:07:26 +01:00
André Hentschel 09761309ad d3dx9_36/tests: Remove unused function (Clang). 2014-12-01 11:00:19 +01:00
André Hentschel 67ee1faba2 d3dx9_36/tests: Remove unused functions (Clang). 2014-11-25 19:49:37 +01:00
Sebastian Lackner b69038e3d9 d3dx9_36: Allow NULL pointer for optional arguments of D3DXIntersectTri. 2014-11-14 14:16:41 +09:00
Sebastian Lackner fc0392a24e d3dx9_36/tests: Remove code to skip test which should never fail. 2014-11-11 16:20:05 +09:00
Sebastian Lackner b8814764aa d3dx9_36/tests: Add tests for D3DXCreatePolygon.
Based on a patch by David Adam.
2014-11-11 16:20:02 +09:00
Sebastian Lackner 0cde50d223 d3dx9_36: Implement D3DXCreatePolygon.
Based on a patch by David Adam.
2014-11-11 16:19:44 +09:00
Matteo Bruni beb72c91af d3dx9: Improve the scoring for fallback formats. 2014-11-11 14:21:12 +09:00
Matteo Bruni 1569698d9e d3dx9: Use an alpha-capable format when creating textures with a color key. 2014-11-11 14:21:07 +09:00
Matteo Bruni fb9c01f1dc d3dx9: Handle GUID_WICPixelFormat8bppGray format. 2014-11-11 14:21:00 +09:00
Matteo Bruni 5aeb834dd4 d3dx9: Allow implicit conversions in D3DXCreateTextureFromFileInMemoryEx.
They should be generally supported by the existing code.
Specific missing format conversions are caught and reported by
D3DXLoadSurfaceFromMemory(), which is called directly or indirectly
from here.
2014-08-27 19:24:41 +02:00
Matteo Bruni 807c01727c d3dx9: Avoid reading outside of the allocated surface memory (Valgrind). 2014-08-27 19:23:06 +02:00
Matteo Bruni 78e02675ab d3dx9: Correctly handle out of memory conditions while reallocating children array. 2014-08-26 18:48:42 +02:00
Matteo Bruni bd4fcdbde5 d3dx9: Remove stray hunk. 2014-08-26 16:44:58 +02:00
Matteo Bruni 7c2c242b2e d3dx9: Release child mesh objects (Valgrind). 2014-08-26 16:44:54 +02:00
Matteo Bruni c87901d3f8 d3dx9/tests: Create the asm shader test files under the temporary files directory. 2014-08-25 22:03:28 +02:00
Matteo Bruni bc8d913199 d3dx9/tests: Add a test for an include path containing '/'. 2014-08-25 22:03:06 +02:00
Matteo Bruni ec364eaa4f d3dx9: Account for include paths mixing '/' and '\'.
Include pathnames are passed unchanged to ID3DInclude objects so e.g.
if a file is included as "path/file.h" the full pathname will have
mixed slashes.
2014-08-25 22:02:41 +02:00
Matteo Bruni 770eaec561 d3dx9: Properly evaluate fallbacks for luminance texture formats in D3DXCheckTextureRequirements. 2014-08-25 22:02:21 +02:00
Marcus Meissner 20ef8d2991 d3dx9_36: Fixed typo in HeapAlloc return checking (Coverity). 2014-07-22 12:08:07 +02:00
Thomas Faber 5bd5c89596 d3dx9_36: Do not omit mandatory argument to WriteFile. 2014-07-14 17:22:38 +02:00
Gediminas Jakutis fe802d92bb d3dx9: Implement D3DXCreateTorus() + tests. 2014-07-10 12:40:34 +02:00
Gediminas Jakutis dc115a2c91 d3dx9: Add adjacency generation for D3DXCreateSphere(). 2014-07-03 11:41:48 +02:00
Frédéric Delanoy 95ae71f3ab Assorted spelling/grammar fixes. 2014-07-01 13:09:13 +02:00
Matteo Bruni d64ec66b41 d3dx9: Correctly set parent_data for direct includes from the main file. 2014-06-26 20:02:13 +02:00
Nikolay Sivov 9475dc58d1 d3dx9: Trace out parameters as pointers (Valgrind). 2014-06-16 09:30:33 +02:00
Matteo Bruni c1bf61e56c d3dx9/tests: Take MaxVolumeExtent into account in some tests. 2014-05-01 20:36:40 +02:00
Matteo Bruni 2a8dae52aa d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported. 2014-05-01 20:36:37 +02:00
Matteo Bruni 8ca7617d4d d3dx9/tests: Don't fail a test if volume textures are not supported. 2014-05-01 20:36:34 +02:00
Matteo Bruni 96e9a70661 d3dx9/tests: Release the device when skipping some tests. 2014-05-01 20:36:31 +02:00
Frédéric Delanoy 2e5cb7aac8 Assorted spelling/grammar fixes. 2014-04-30 18:34:20 +02:00
Matteo Bruni b3c5d2ccda d3dx9: Skip the AddRef/Release calls if the new texture is the same as the old one. 2014-04-17 19:06:08 +02:00
Matteo Bruni 96b0b91752 d3dx9: Copy the entire vector at once if there is no need of type conversions. 2014-04-17 13:53:06 +02:00
Stefan Dösinger ed3b1037f9 d3dx9_36/tests: Initialize some test values. 2014-04-01 20:58:01 +02:00
Matteo Bruni 5cfca92c53 d3dx9: Copy the entire matrix at once if there is no need of type conversions. 2014-03-18 11:39:40 +01:00
Matteo Bruni 1e2fbcc99b d3dx9: Split out set_matrix_transpose from set_matrix. 2014-03-18 11:39:37 +01:00
Matteo Bruni babf0dca03 d3dx9: Parse "usage 2" effect resources. 2014-03-18 11:39:34 +01:00
Matteo Bruni 0e0b613192 d3dx9: Store pointers to referenced parameters for "usage 1" resources. 2014-03-18 11:39:31 +01:00
Matteo Bruni aef52a1d13 d3dx9: Create shaders and strings. 2014-03-18 11:39:26 +01:00
Matteo Bruni 7617951dfd d3dx9: Correctly handle empty parameter data. 2014-03-13 20:22:19 +01:00
Matteo Bruni 9295ee0c0b d3dx9/tests: Mark a test todo_wine when DXTn textures aren't supported by the GL driver. 2014-03-13 20:22:18 +01:00
Matteo Bruni d6a919af89 d3dx9/tests: Skip a test if DXTn texture formats are not supported. 2014-03-13 20:22:17 +01:00
Matteo Bruni d96d0af83d d3dx9/tests: Skip some volume tests if loading the texture fails. 2014-03-13 20:22:16 +01:00
Matteo Bruni db4bf1e1d4 d3dx9: Fix a WARN. 2014-03-13 20:22:14 +01:00
Rico Schüller 9809a3670c d3dx9/tests: Check if D3DFMT_X1R5G5B5 is supported. 2014-03-11 19:39:27 +01:00
Henri Verbeet c91c8ca92d d3dx9: Use a 1x1x1 unit box in D3DXCreateBox(). 2014-03-07 11:34:00 +01:00
Matteo Bruni 83c3f8c9ed d3dx9: Free string data. 2014-03-05 19:18:20 +01:00
Matteo Bruni 596557a57a d3dx9: Support skipping mip levels in D3DXCreateTextureFromFileInMemoryEx. 2014-03-05 19:18:17 +01:00
Matteo Bruni 7788161c91 d3dx9: Introduce a handle table for parameters to make lookup faster. 2014-03-05 19:18:11 +01:00
Matteo Bruni db8e1df742 d3dx9: Fix an error trace. 2014-03-05 19:17:12 +01:00
Matteo Bruni e32672f2d7 d3dx9/tests: Replace a test giving inconsistent results on Windows. 2014-03-03 17:53:55 +01:00
Matteo Bruni df3c573f63 d3dx9: Allow loading DDS volume textures into 2D textures. 2014-03-03 17:53:53 +01:00
Matteo Bruni 9008971bde d3dx9: Improve a number of WARN messages. 2014-03-03 17:53:50 +01:00
Matteo Bruni 8b5cd9edbc d3dx9: Always use type->Rows as D3DXPC_MATRIX_ROWS parameters size. 2014-03-03 17:53:37 +01:00
Matteo Bruni c6fefc20a6 d3dx9: Turn D3DXCreateEffectEx FIXME into a TRACE, improve it a bit. 2014-03-03 17:53:34 +01:00
Gediminas Jakutis 6749bdf66b d3dx9/tests: Add a mesh test for D3DXCreateBox(). 2014-03-03 17:46:44 +01:00
Gediminas Jakutis cc3ec2da1a d3dx9: Implement D3DXCreateBox(). 2014-03-03 17:46:42 +01:00
Matteo Bruni 8226a187d6 d3dx9: Don't call CoUninitialize if CoInitializeEx failed. 2014-02-25 14:18:07 -06:00
Matteo Bruni 244100f01c d3dx9: Remove Begin/End stub fixmes. 2014-02-25 14:17:59 -06:00
Matteo Bruni 49604ca1b7 d3dx9: Kill a noisy TRACE. 2014-02-25 14:17:51 -06:00