Rebase patches against upstream Wine.

This commit is contained in:
Sebastian Lackner
2015-01-28 23:25:01 +01:00
parent cfdd73e2c4
commit 96b6186af1
3 changed files with 29 additions and 26 deletions

View File

@@ -4479,7 +4479,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
&adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT)))
{
ERR("Failed to initialize device state, hr %#x.\n", hr);
@@ -4927,6 +5654,7 @@
@@ -4937,6 +5664,7 @@
else
return CallWindowProcA(proc, window, message, wparam, lparam);
}
@@ -4487,7 +4487,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
/* Context activation is done by the caller */
struct wined3d_gl_bo *wined3d_device_get_bo(struct wined3d_device *device, UINT size, GLenum gl_usage,
@@ -4980,3 +5708,4 @@
@@ -4990,3 +5718,4 @@
wined3d_device_destroy_bo(device, context, bo);
}