wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 59ee884bdf4947f5939499456539fca7a5806939.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-05-31 23:09:34 +02:00
parent 8bede16222
commit 4705d850ea
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch
View File

@ -1,4 +1,4 @@
From 4283d60c4b362e518c7028484b44d9df2ecd27cc Mon Sep 17 00:00:00 2001
From 29ccadcb0e716255ac5e43b8784d129f3fc2a441 Mon Sep 17 00:00:00 2001
From: Christian Costa <titan.costa@gmail.com>
Date: Fri, 19 Dec 2014 22:31:46 +0100
Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
@ -9,10 +9,10 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
2 files changed, 91 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index da7de54..809f11e 100644
index 7772406..00c486c 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3542,13 +3542,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3538,13 +3538,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@ -56,13 +56,13 @@ index da7de54..809f11e 100644
+ return S_FALSE;
}
static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique)
static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index 4ef4d4c..59cd6cc 100644
index 41db494..efc991e 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -3983,6 +3983,65 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device)
&op_tests[i]);
@@ -4275,6 +4275,65 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
}
+/*
@ -127,10 +127,10 @@ index 4ef4d4c..59cd6cc 100644
START_TEST(effect)
{
HWND wnd;
@@ -4025,6 +4084,7 @@ START_TEST(effect)
test_effect_states(device);
@@ -4318,6 +4377,7 @@ START_TEST(effect)
test_effect_preshader(device);
test_effect_preshader_ops(device);
test_effect_isparameterused(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "c89dc58deb9ba74d8dcd7faf7012203cff0724a0"
echo "59ee884bdf4947f5939499456539fca7a5806939"
}
# Show version information