mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against f8031d06486761b1068a5b4fa8572d08efdfb8f1.
This commit is contained in:
parent
543b9eaae1
commit
efdf5d2bc2
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "4b1445940d47870895b7fa87b7d69d12abe701ef"
|
||||
echo "f8031d06486761b1068a5b4fa8572d08efdfb8f1"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user