Rebase against b278bb8f5670a123b25d51fd8c927cb4f896a574.

This commit is contained in:
Sebastian Lackner 2016-02-10 02:20:14 +01:00
parent 3883513261
commit 51917ee882
3 changed files with 107 additions and 107 deletions

View File

@ -1,4 +1,4 @@
From fa15751fb4c91885360b81474abf16b5a4b93a99 Mon Sep 17 00:00:00 2001
From 832df3192f9eea905f6bd12b273735c5ec037249 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,18 +9,18 @@ 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 d31cf9a..dd2def2 100644
index 5933b48..e3b954d 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -222,6 +222,8 @@
@@ -220,6 +220,8 @@
@ cdecl wined3d_stateblock_decref(ptr)
@ cdecl wined3d_stateblock_incref(ptr)
+@ cdecl wined3d_strictdrawing_set(long)
+
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_swapchain_create(ptr ptr ptr ptr 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

View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "195d16c8267fcd5085048b3513571e2fee0eb548"
echo "b278bb8f5670a123b25d51fd8c927cb4f896a574"
}
# Show version information

File diff suppressed because it is too large Load Diff