Rebase against b1aee9c391a7e3ce4a069993d527dbdc518ef29c.

This commit is contained in:
Zebediah Figura
2018-03-01 16:03:19 -06:00
parent 092274bdf7
commit 745e1c5f96
21 changed files with 38 additions and 1037 deletions

View File

@@ -271,7 +271,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2505,7 +2505,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface,
@@ -2522,7 +2522,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface,
/* Don't use PBOs for converted surfaces. During PBO conversion we look at
* WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is
* getting called. */