Rebase against e8b9bda53ac39c913ddc93de0308f0c8b69605fc.

This commit is contained in:
Sebastian Lackner
2015-10-12 20:14:46 +02:00
parent cc0556df4a
commit e3ea1eef0d
13 changed files with 30 additions and 3483 deletions

View File

@@ -1687,7 +1687,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
@@ -1164,7 +1164,11 @@
@@ -1195,7 +1195,11 @@
* result on Wine.
* {D3DFMT_YUY2, "D3DFMT_YUY2", BLOCKS, 0},
* {D3DFMT_UYVY, "D3DFMT_UYVY", BLOCKS, 0}, */
@@ -1699,7 +1699,7 @@ diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
/* Vendor-specific formats like ATI2N are a non-issue here since they're not
* supported as offscreen plain surfaces and do not support D3DUSAGE_RENDERTARGET
* when created as texture. */
@@ -17304,7 +17308,11 @@
@@ -17363,7 +17367,11 @@
fill_surface(surface_managed, 0x0000ff00, D3DLOCK_NO_DIRTY_UPDATE);
add_dirty_rect_test_draw(device);
color = getPixelColor(device, 320, 240);