Rebase against f0053d06c4fc168360da638fa26f1927fe975262.

This commit is contained in:
Sebastian Lackner
2016-02-09 23:57:18 +01:00
parent cf7f966347
commit e2e98ce27a
4 changed files with 121 additions and 121 deletions

View File

@@ -1,4 +1,4 @@
From 166196873b1b6149e6f026abefef31b17e087cf4 Mon Sep 17 00:00:00 2001
From fa15751fb4c91885360b81474abf16b5a4b93a99 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 53eb97a..57500f2 100644
index d31cf9a..dd2def2 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -222,6 +222,8 @@
@@ -20,7 +20,7 @@ index 53eb97a..57500f2 100644
+
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_update_overlay_z_order(ptr long 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