tests: Run d3d9 and d3d12 tests on non-cross builds too.

On cross builds, shaders are compiled with d3dcompiler_47.dll and
run with d3dN.dll. On non-cross builds, shaders are compiled with
vkd3d-shader and run with d3dN.dll (on Windows) or Vulkan and vkd3d
(on Linux).
This commit is contained in:
Giovanni Mascellani
2023-01-18 13:53:51 +01:00
committed by Alexandre Julliard
parent 44d9e2d728
commit 2445743002
Notes: Alexandre Julliard 2023-01-24 22:27:46 +01:00
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/57
5 changed files with 16 additions and 3 deletions

View File

@@ -18,8 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifdef _WIN32
#define COBJMACROS
#define CONST_VTABLE
#define INITGUID
#define VKD3D_TEST_NO_DEFS
#include <d3d11_4.h>
#define __vkd3d_d3dcommon_h__
@@ -29,8 +32,6 @@
#include "shader_runner.h"
#include "vkd3d_test.h"
const GUID IID_IDXGIDevice = {0x54ec77fa, 0x1377, 0x44e6, {0x8c, 0x32, 0x88, 0xfd, 0x5f, 0x44, 0xc8, 0x4c}};
static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory);
static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type,
@@ -711,3 +712,5 @@ void run_shader_tests_d3d11(int argc, char **argv)
FreeLibrary(d3d11_module);
FreeLibrary(dxgi_module);
}
#endif