mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 257ee8cc6e63acc54576f60ad09de5b4051f8045.
This commit is contained in:
parent
d55612ab9c
commit
901c33023f
@ -1,4 +1,4 @@
|
||||
From 4be2da4492530a2704a8135dc2f65781c968f625 Mon Sep 17 00:00:00 2001
|
||||
From 1718cf1538f3ba9d914df29ad811f653b86129d5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 20 Jul 2014 22:22:14 +0200
|
||||
Subject: wined3d: allow changing strict drawing through an exported function
|
||||
@ -9,7 +9,7 @@ Subject: wined3d: allow changing strict drawing through an exported function
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
|
||||
index cd8174c..34afb71 100644
|
||||
index c8a172f..6d656c5 100644
|
||||
--- a/dlls/wined3d/wined3d.spec
|
||||
+++ b/dlls/wined3d/wined3d.spec
|
||||
@@ -222,6 +222,8 @@
|
||||
@ -19,8 +19,8 @@ index cd8174c..34afb71 100644
|
||||
+@ cdecl wined3d_strictdrawing_set(long)
|
||||
+
|
||||
@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long)
|
||||
@ cdecl wined3d_surface_from_resource(ptr)
|
||||
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
|
||||
@ cdecl wined3d_surface_get_parent(ptr)
|
||||
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
|
||||
index 0543d97..78cc3a2 100644
|
||||
--- a/dlls/wined3d/wined3d_main.c
|
||||
|
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "37503be65497b97fe5197c2c5c28486e3ff73e59"
|
||||
echo "257ee8cc6e63acc54576f60ad09de5b4051f8045"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user