Module: wine Branch: master Commit: 871657f169a28b3177cc7c36e784e4d8a41bdb1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=871657f169a28b3177cc7c36e7...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Sun Apr 9 22:36:37 2017 +0200
d3d8/tests: Introduce mip-mapping to add_dirty_rect_test().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d8/tests/visual.c | 53 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d314edb..d97f467 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5219,7 +5219,7 @@ static void add_dirty_rect_test(void) IDirect3DTexture8 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed, *tex_dynamic; IDirect3DSurface8 *surface_dst2, *surface_src_green, *surface_src_red, - *surface_managed, *surface_dynamic; + *surface_managed0, *surface_managed1, *surface_dynamic; D3DLOCKED_RECT locked_rect; IDirect3DDevice8 *device; IDirect3D8 *d3d; @@ -5253,7 +5253,7 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &tex_src_green); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, + hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 2, 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, &tex_managed); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 256, 256, 1, D3DUSAGE_DYNAMIC, @@ -5266,7 +5266,9 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_src_red, 0, &surface_src_red); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); - hr = IDirect3DTexture8_GetSurfaceLevel(tex_managed, 0, &surface_managed); + hr = IDirect3DTexture8_GetSurfaceLevel(tex_managed, 0, &surface_managed0); + ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(tex_managed, 1, &surface_managed1); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); hr = IDirect3DTexture8_GetSurfaceLevel(tex_dynamic, 0, &surface_dynamic); ok(SUCCEEDED(hr), "Failed to get surface level, hr %#x.\n", hr); @@ -5280,6 +5282,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MIPFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mip filter, hr %#x.\n", hr);
hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)tex_src_green, (IDirect3DBaseTexture8 *)tex_dst1); @@ -5463,7 +5467,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
/* Tests with managed textures. */ - fill_surface(surface_managed, 0x00ff0000, 0); + fill_surface(surface_managed0, 0x00ff0000, 0); + fill_surface(surface_managed1, 0x00ff0000, 0); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)tex_managed); ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); add_dirty_rect_test_draw(device); @@ -5472,15 +5477,30 @@ static void add_dirty_rect_test(void) "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, 1); + ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
/* Managed textures also honor D3DLOCK_NO_DIRTY_UPDATE. */ - fill_surface(surface_managed, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE); + fill_surface(surface_managed0, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE); + fill_surface(surface_managed1, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); ok(color_match(color, 0x00ff0000, 1), "Expected color 0x00ff0000, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, 0); + ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
/* AddDirtyRect uploads the new contents. * Side note, not tested in the test: Partial surface updates work, and two separate @@ -5494,15 +5514,29 @@ static void add_dirty_rect_test(void) "Expected color 0x0000ff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, 1); + ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
/* So does ResourceManagerDiscardBytes. */ - fill_surface(surface_managed, 0x000000ff, D3DLOCK_NO_DIRTY_UPDATE); + fill_surface(surface_managed0, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); + fill_surface(surface_managed1, 0x00ff00ff, D3DLOCK_NO_DIRTY_UPDATE); hr = IDirect3DDevice8_ResourceManagerDiscardBytes(device, 0); ok(SUCCEEDED(hr), "Failed to evict managed resources, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x000000ff, 1), - "Expected color 0x000000ff, got 0x%08x.\n", color); + ok(color_match(color, 0x00ff00ff, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAXMIPLEVEL, 0); + ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00ffff00, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr);
@@ -5541,7 +5575,8 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr);
IDirect3DSurface8_Release(surface_dst2); - IDirect3DSurface8_Release(surface_managed); + IDirect3DSurface8_Release(surface_managed1); + IDirect3DSurface8_Release(surface_managed0); IDirect3DSurface8_Release(surface_src_red); IDirect3DSurface8_Release(surface_src_green); IDirect3DSurface8_Release(surface_dynamic);