Rebase against 6e30b042e17b4a62f48ca29f26cf9e62c7fd077a.

This commit is contained in:
Sebastian Lackner
2016-02-08 19:13:08 +01:00
parent 089f367941
commit d35ab071b5
5 changed files with 118 additions and 118 deletions

View File

@@ -1,4 +1,4 @@
From 8e79e9494a7d4c9173066772b09afa26e643ef33 Mon Sep 17 00:00:00 2001
From 863dce444080b590bef8a9f31e38fc69aa18b29a 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 49041bb..8c253cd 100644
index 082a693..91fcf0f 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -222,6 +222,8 @@
@@ -18,9 +18,9 @@ index 49041bb..8c253cd 100644
+@ cdecl wined3d_strictdrawing_set(long)
+
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
@ cdecl wined3d_surface_get_parent(ptr)
@ cdecl wined3d_surface_get_pitch(ptr)
@ cdecl wined3d_surface_set_overlay_position(ptr long long)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 0543d97..78cc3a2 100644
--- a/dlls/wined3d/wined3d_main.c