Rebase against 5bd9d58016236da3142e030add2efbb2789fa2e4.

This commit is contained in:
Sebastian Lackner
2015-07-29 22:53:17 +02:00
parent 5ec4d6171e
commit 493ed4662c
14 changed files with 77 additions and 599 deletions

View File

@@ -1738,7 +1738,7 @@ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -17301,7 +17301,11 @@
@@ -17304,7 +17304,11 @@
fill_surface(surface_managed, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE);
add_dirty_rect_test_draw(device);
color = getPixelColor(device, 320, 240);