From efdf5d2bc2a2b2fdd0a0fa7ece01df135fd8c7f5 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 14 Mar 2017 03:37:18 +0100 Subject: [PATCH] Rebase against f8031d06486761b1068a5b4fa8572d08efdfb8f1. --- patches/patchinstall.sh | 2 +- patches/wined3d-CSMT_Main/9999-IfDefined.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d0cdda67..54c71702 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "4b1445940d47870895b7fa87b7d69d12abe701ef" + echo "f8031d06486761b1068a5b4fa8572d08efdfb8f1" } # Show version information diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 534dd3b7..b47aaba3 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -54,7 +54,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c -@@ -3730,6 +3730,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, +@@ -3720,6 +3720,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx);