Signed-off-by: Józef Kucia jkucia@codeweavers.com --- dlls/ddraw/tests/d3d.c | 30 ------------------------- dlls/ddraw/tests/ddraw4.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 108 insertions(+), 30 deletions(-)
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 376008144678..205a4c6994c6 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -482,35 +482,6 @@ static void SceneTest(void) /* TODO: Verify that blitting works in the same way as in d3d9 */ }
-static void LimitTest(void) -{ - IDirectDrawSurface7 *pTexture = NULL; - HRESULT hr; - int i; - DDSURFACEDESC2 ddsd; - - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = 16; - ddsd.dwHeight = 16; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &pTexture, NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if(!pTexture) return; - - for(i = 0; i < 8; i++) { - hr = IDirect3DDevice7_SetTexture(lpD3DDevice, i, pTexture); - ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture for sampler %d failed with %08x\n", i, hr); - hr = IDirect3DDevice7_SetTexture(lpD3DDevice, i, NULL); - ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture for sampler %d failed with %08x\n", i, hr); - hr = IDirect3DDevice7_SetTextureStageState(lpD3DDevice, i, D3DTSS_COLOROP, D3DTOP_ADD); - ok(hr == D3D_OK, "IDirect3DDevice8_SetTextureStageState for texture %d failed with %08x\n", i, hr); - } - - IDirectDrawSurface7_Release(pTexture); -} - static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, char *DeviceName, D3DDEVICEDESC *hal, D3DDEVICEDESC *hel, void *ctx) { @@ -3475,7 +3446,6 @@ START_TEST(d3d) LightTest(); StateTest(); SceneTest(); - LimitTest(); D3D7EnumTest(); D3D7EnumLifetimeTest(); SetMaterialTest(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cbb3425d16cf..1e4a55cbe27b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14009,6 +14009,61 @@ static void test_compute_sphere_visibility(void) DestroyWindow(window); }
+static void test_texture_stages_limits(void) +{ + IDirectDrawSurface4 *surface; + DDSURFACEDESC2 surface_desc; + IDirect3DTexture2 *texture; + IDirect3DDevice3 *device; + IDirectDraw4 *ddraw; + IDirect3D3 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw interface, hr %#x.\n", hr); + IDirect3D3_Release(d3d); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + surface_desc.dwWidth = 16; + surface_desc.dwHeight = 16; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_QueryInterface(surface, &IID_IDirect3DTexture2, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + IDirectDrawSurface4_Release(surface); + + for (i = 0; i < 8; ++i) + { + hr = IDirect3DDevice3_SetTexture(device, i, texture); + ok(hr == D3D_OK, "Failed to set texture %u, hr %#x.\n", i, hr); + hr = IDirect3DDevice3_SetTexture(device, i, NULL); + ok(hr == D3D_OK, "Failed to set texture %u, hr %#x.\n", i, hr); + hr = IDirect3DDevice3_SetTextureStageState(device, i, D3DTSS_COLOROP, D3DTOP_ADD); + ok(hr == D3D_OK, "Failed to set texture stage state %u, hr %#x.\n", i, hr); + } + + IDirectDraw4_Release(ddraw); + IDirect3DTexture2_Release(texture); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void test_map_synchronisation(void) { LARGE_INTEGER frequency, diff, ts[3]; @@ -14750,6 +14805,7 @@ START_TEST(ddraw4) test_ck_operation(); test_vb_refcount(); test_compute_sphere_visibility(); + test_texture_stages_limits(); test_map_synchronisation(); test_depth_readback(); test_clear(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c904e77849d7..e1b387fc574e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13385,6 +13385,57 @@ static void test_clip_planes_limits(void) DestroyWindow(window); }
+static void test_texture_stages_limits(void) +{ + IDirectDrawSurface7 *texture; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + IDirect3D7 *d3d; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + surface_desc.dwWidth = 16; + surface_desc.dwHeight = 16; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &texture, NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + + for (i = 0; i < 8; ++i) + { + hr = IDirect3DDevice7_SetTexture(device, i, texture); + ok(hr == D3D_OK, "Failed to set texture %u, hr %#x.\n", i, hr); + hr = IDirect3DDevice7_SetTexture(device, i, NULL); + ok(hr == D3D_OK, "Failed to set texture %u, hr %#x.\n", i, hr); + hr = IDirect3DDevice7_SetTextureStageState(device, i, D3DTSS_COLOROP, D3DTOP_ADD); + ok(hr == D3D_OK, "Failed to set texture stage state %u, hr %#x.\n", i, hr); + } + + IDirectDrawSurface7_Release(texture); + IDirectDraw7_Release(ddraw); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + static void test_map_synchronisation(void) { LARGE_INTEGER frequency, diff, ts[3]; @@ -14092,6 +14143,7 @@ START_TEST(ddraw7) test_vb_refcount(); test_compute_sphere_visibility(); test_clip_planes_limits(); + test_texture_stages_limits(); test_map_synchronisation(); test_depth_readback(); test_clear();