wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to forward various functions from d3d10_1 to d3d10.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-07-05 21:45:45 +02:00
parent f5734d67c8
commit ed54d227d8
2 changed files with 86 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
patches/d3d10_1-Forwards/0001-d3d10_1-Add-missing-forwards-to-d3d10.patch Normal file
View File

@ -0,0 +1,70 @@
From a9daa20013ed733317fb0c8680c13549a0595d02 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Tue, 5 Jul 2016 21:42:23 +0200
Subject: d3d10_1: Add missing forwards to d3d10.
Spotted by Jarkko Korpi.
---
dlls/d3d10_1/d3d10_1.spec | 24 ++++++++++++------------
tools/make_specfiles | 4 ++++
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec
index 18eb3ac..10edc3f 100644
--- a/dlls/d3d10_1/d3d10_1.spec
+++ b/dlls/d3d10_1/d3d10_1.spec
@@ -1,24 +1,24 @@
@ stub RevertToOldImplementation
-@ stub D3D10CompileEffectFromMemory
-@ stub D3D10CompileShader
-@ stub D3D10CreateBlob
+@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) d3d10.D3D10CompileEffectFromMemory
+@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) d3d10.D3D10CompileShader
+@ stdcall D3D10CreateBlob(long ptr) d3d10.D3D10CreateBlob
@ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr)
@ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr)
@ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory
@ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) d3d10.D3D10CreateEffectPoolFromMemory
@ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock
@ stub D3D10DisassembleEffect
-@ stub D3D10DisassembleShader
-@ stub D3D10GetGeometryShaderProfile
-@ stub D3D10GetInputAndOutputSignatureBlob
-@ stub D3D10GetInputSignatureBlob
-@ stub D3D10GetOutputSignatureBlob
-@ stub D3D10GetPixelShaderProfile
-@ stub D3D10GetShaderDebugInfo
+@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) d3d10.D3D10DisassembleShader
+@ stdcall D3D10GetGeometryShaderProfile(ptr) d3d10.D3D10GetGeometryShaderProfile
+@ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputAndOutputSignatureBlob
+@ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputSignatureBlob
+@ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetOutputSignatureBlob
+@ stdcall D3D10GetPixelShaderProfile(ptr) d3d10.D3D10GetPixelShaderProfile
+@ stdcall D3D10GetShaderDebugInfo(ptr long ptr) d3d10.D3D10GetShaderDebugInfo
@ stub D3D10GetVersion
-@ stub D3D10GetVertexShaderProfile
+@ stdcall D3D10GetVertexShaderProfile(ptr) d3d10.D3D10GetVertexShaderProfile
@ stub D3D10PreprocessShader
-@ stub D3D10ReflectShader
+@ stdcall D3D10ReflectShader(ptr long ptr) d3d10.D3D10ReflectShader
@ stub D3D10RegisterLayers
@ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) d3d10.D3D10StateBlockMaskDifference
@ stdcall D3D10StateBlockMaskDisableAll(ptr) d3d10.D3D10StateBlockMaskDisableAll
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 85d39d8..e36685d 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -73,6 +73,10 @@ my @dll_groups =
"msvcp120_app",
],
[
+ "d3d10",
+ "d3d10_1",
+ ],
+ [
"d3dx10_43",
"d3dx10_42",
"d3dx10_41",
--
2.8.0

16
patches/patchinstall.sh
View File

@ -102,6 +102,7 @@ patch_enable_all ()
enable_crypt32_CMS_Certificates="$1"
enable_crypt32_CryptUnprotectMemory="$1"
enable_d2d1_Tests="$1"
enable_d3d10_1_Forwards="$1"
enable_d3d9_DesktopWindow="$1"
enable_d3d9_Surface_Refcount="$1"
enable_d3d9_Tests="$1"
@ -483,6 +484,9 @@ patch_enable ()
d2d1-Tests)
enable_d2d1_Tests="$2"
;;
d3d10_1-Forwards)
enable_d3d10_1_Forwards="$2"
;;
d3d9-DesktopWindow)
enable_d3d9_DesktopWindow="$2"
;;
@ -2835,6 +2839,18 @@ if test "$enable_d2d1_Tests" -eq 1; then
) >> "$patchlist"
fi
# Patchset d3d10_1-Forwards
# |
# | Modified files:
# | * dlls/d3d10_1/d3d10_1.spec, tools/make_specfiles
# |
if test "$enable_d3d10_1_Forwards" -eq 1; then
patch_apply d3d10_1-Forwards/0001-d3d10_1-Add-missing-forwards-to-d3d10.patch
(
echo '+ { "Sebastian Lackner", "d3d10_1: Add missing forwards to d3d10.", 1 },';
) >> "$patchlist"
fi
# Patchset d3d9-DesktopWindow
# |
# | Modified files: