Module: wine Branch: stable Commit: c694f5eb74167f46c136deb16777860c48d73375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c694f5eb74167f46c136deb167...
Author: Akihiro Sagawa sagawa.aki@gmail.com Date: Sat Feb 4 19:56:57 2017 +0900
wined3d: Upload textures if NO_DIRTY_UPDATE flag is set when locking dynamic textures.
Signed-off-by: Akihiro Sagawa sagawa.aki@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 6cf2dc67e1eb06b5c5483c82b16ed55dd0272d2d) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e2b7742..4b6c1dc 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5521,7 +5521,7 @@ static void add_dirty_rect_test(void) fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ffff00, 1), + ok(color_match(color, 0x00ffff00, 1), "Expected color 0x00ffff00, got 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 068fb4e..963d37b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17592,7 +17592,7 @@ static void add_dirty_rect_test(void) fill_surface(surface_dynamic, 0x00ffff00, D3DLOCK_NO_DIRTY_UPDATE); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00ffff00, 1), + ok(color_match(color, 0x00ffff00, 1), "Expected color 0x00ffff00, got 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da003e1..9857a82 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1752,7 +1752,8 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return E_OUTOFMEMORY; }
- if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + if (!(flags & WINED3D_MAP_READONLY) + && (!(flags & WINED3D_MAP_NO_DIRTY_UPDATE) || (resource->usage & WINED3DUSAGE_DYNAMIC))) wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding);
wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding);