From bb7a58dc484dc32abdc06acc9add92bf5bc34901 Mon Sep 17 00:00:00 2001 From: Reece Dunn Date: Thu, 31 Jul 2008 09:06:48 +0100 Subject: [PATCH] d3d9: removed the SetMaterial test from device as this is crashing on several platforms. --- dlls/d3d9/tests/device.c | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3a56298..3164b81 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2016,41 +2016,6 @@ static void test_display_formats() if(d3d9) IDirect3D9_Release(d3d9); } -static void test_set_material(void) -{ - D3DPRESENT_PARAMETERS present_parameters; - IDirect3DDevice9 *device = NULL; - IDirect3D9 *d3d9; - HWND hwnd; - HRESULT hr; - - d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); - ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); - ok(hwnd != NULL, "Failed to create window\n"); - if (!d3d9 || !hwnd) goto cleanup; - - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - - IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); - if(!device) - { - skip("Failed to create a d3d device\n"); - goto cleanup; - } - - hr = IDirect3DDevice9_SetMaterial(device, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %08x\n", hr); - - cleanup: - if(device) IDirect3DDevice9_Release(device); - if(d3d9) IDirect3D9_Release(d3d9); -} - START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2080,6 +2045,5 @@ START_TEST(device) test_vertex_buffer_alignment(); test_lights(); test_set_stream_source(); - test_set_material(); } } -- 1.5.6.1.1071.g76fb