wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 510c8e39838e4ceef1a66b42e7e58484bf4ac143.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-03-23 18:04:51 +01:00
parent 70b46ff603
commit 711cfa9cf4
3 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 000f06385dc49a3f2ddc1d866013e7632a6e0370 Mon Sep 17 00:00:00 2001
From 66ea1296b0b3493271a7611bfa56b0d74b34b16c 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 4be6e4b..ecd1b74 100644
index a210bb3..2fbc1cb 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3471,13 +3471,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
@@ -3483,13 +3483,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
return D3D_OK;
}
@@ -58,11 +58,11 @@ index 4be6e4b..ecd1b74 100644
static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique)
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index de7d1e9..f34b1f8 100644
index c388e7d..8653e0e 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -2972,6 +2972,65 @@ static void test_effect_states(IDirect3DDevice9 *device)
ok(value == 3, "Got result %u, expected %u.\n", value, 1);
@@ -3886,6 +3886,65 @@ static void test_effect_preshader(IDirect3DDevice9 *device)
effect->lpVtbl->Release(effect);
}
+/*
@@ -127,10 +127,10 @@ index de7d1e9..f34b1f8 100644
START_TEST(effect)
{
HWND wnd;
@@ -3011,6 +3070,7 @@ START_TEST(effect)
test_effect_variable_names(device);
@@ -3927,6 +3986,7 @@ START_TEST(effect)
test_effect_compilation_errors(device);
test_effect_states(device);
test_effect_preshader(device);
+ test_effect_technique_validation(device);
count = IDirect3DDevice9_Release(device);