huwcampbell.com
Reactos
[WINESYNC] d3dx9_*: Add D3DXSHProjectCubeMap stub
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284
wine-staging patch by Andrey Gusev <andrey.goosev@gmail.com>
authored by
winesync
and committed by
Jérôme Gardou
1dfb089b
5687b220
+332
-20
+1
-1
dll/directx/wine/d3dx9_24/d3dx9_24.spec
+1
-1
dll/directx/wine/d3dx9_24/d3dx9_24.spec
···
256
256
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
257
257
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
258
258
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
259
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
259
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
260
260
@ stdcall D3DXSHRotate(ptr long ptr ptr)
261
261
@ stdcall D3DXSHRotateZ(ptr long float ptr)
262
262
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_25/d3dx9_25.spec
+1
-1
dll/directx/wine/d3dx9_25/d3dx9_25.spec
···
256
256
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
257
257
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
258
258
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
259
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
259
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
260
260
@ stdcall D3DXSHRotate(ptr long ptr ptr)
261
261
@ stdcall D3DXSHRotateZ(ptr long float ptr)
262
262
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_26/d3dx9_26.spec
+1
-1
dll/directx/wine/d3dx9_26/d3dx9_26.spec
···
260
260
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
261
261
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
262
262
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
263
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
263
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
264
264
@ stdcall D3DXSHRotate(ptr long ptr ptr)
265
265
@ stdcall D3DXSHRotateZ(ptr long float ptr)
266
266
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_27/d3dx9_27.spec
+1
-1
dll/directx/wine/d3dx9_27/d3dx9_27.spec
···
260
260
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
261
261
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
262
262
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
263
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
263
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
264
264
@ stdcall D3DXSHRotate(ptr long ptr ptr)
265
265
@ stdcall D3DXSHRotateZ(ptr long float ptr)
266
266
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_28/d3dx9_28.spec
+1
-1
dll/directx/wine/d3dx9_28/d3dx9_28.spec
···
265
265
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
266
266
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
267
267
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
268
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
268
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
269
269
@ stdcall D3DXSHRotate(ptr long ptr ptr)
270
270
@ stdcall D3DXSHRotateZ(ptr long float ptr)
271
271
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_29/d3dx9_29.spec
+1
-1
dll/directx/wine/d3dx9_29/d3dx9_29.spec
···
265
265
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
266
266
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
267
267
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
268
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
268
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
269
269
@ stdcall D3DXSHRotate(ptr long ptr ptr)
270
270
@ stdcall D3DXSHRotateZ(ptr long float ptr)
271
271
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_30/d3dx9_30.spec
+1
-1
dll/directx/wine/d3dx9_30/d3dx9_30.spec
···
265
265
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
266
266
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
267
267
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
268
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
268
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
269
269
@ stdcall D3DXSHRotate(ptr long ptr ptr)
270
270
@ stdcall D3DXSHRotateZ(ptr long float ptr)
271
271
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_31/d3dx9_31.spec
+1
-1
dll/directx/wine/d3dx9_31/d3dx9_31.spec
···
262
262
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
263
263
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
264
264
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
265
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
265
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
266
266
@ stdcall D3DXSHRotate(ptr long ptr ptr)
267
267
@ stdcall D3DXSHRotateZ(ptr long float ptr)
268
268
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_32/d3dx9_32.spec
+1
-1
dll/directx/wine/d3dx9_32/d3dx9_32.spec
···
267
267
@ stub D3DXSHMultiply6(ptr ptr ptr)
268
268
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
269
269
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
270
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
270
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
271
271
@ stdcall D3DXSHRotate(ptr long ptr ptr)
272
272
@ stdcall D3DXSHRotateZ(ptr long float ptr)
273
273
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_33/d3dx9_33.spec
+1
-1
dll/directx/wine/d3dx9_33/d3dx9_33.spec
···
267
267
@ stub D3DXSHMultiply6(ptr ptr ptr)
268
268
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
269
269
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
270
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
270
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
271
271
@ stdcall D3DXSHRotate(ptr long ptr ptr)
272
272
@ stdcall D3DXSHRotateZ(ptr long float ptr)
273
273
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_34/d3dx9_34.spec
+1
-1
dll/directx/wine/d3dx9_34/d3dx9_34.spec
···
267
267
@ stub D3DXSHMultiply6(ptr ptr ptr)
268
268
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
269
269
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
270
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
270
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
271
271
@ stdcall D3DXSHRotate(ptr long ptr ptr)
272
272
@ stdcall D3DXSHRotateZ(ptr long float ptr)
273
273
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_35/d3dx9_35.spec
+1
-1
dll/directx/wine/d3dx9_35/d3dx9_35.spec
···
267
267
@ stub D3DXSHMultiply6(ptr ptr ptr)
268
268
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
269
269
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
270
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
270
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
271
271
@ stdcall D3DXSHRotate(ptr long ptr ptr)
272
272
@ stdcall D3DXSHRotateZ(ptr long float ptr)
273
273
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_36/d3dx9_36.spec
+1
-1
dll/directx/wine/d3dx9_36/d3dx9_36.spec
···
269
269
@ stub D3DXSHMultiply6(ptr ptr ptr)
270
270
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
271
271
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
272
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
272
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
273
273
@ stdcall D3DXSHRotate(ptr long ptr ptr)
274
274
@ stdcall D3DXSHRotateZ(ptr long float ptr)
275
275
@ stdcall D3DXSHScale(ptr long ptr float)
+14
dll/directx/wine/d3dx9_36/math.c
+14
dll/directx/wine/d3dx9_36/math.c
···
2973
2973
out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35];
2974
2974
}
2975
2975
2976
+
HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout)
2977
+
{
2978
+
FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout);
2979
+
2980
+
if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER)
2981
+
return D3DERR_INVALIDCALL;
2982
+
2983
+
*rout = 0.0f;
2984
+
*gout = 0.0f;
2985
+
*bout = 0.0f;
2986
+
2987
+
return D3D_OK;
2988
+
}
2989
+
2976
2990
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in)
2977
2991
{
2978
2992
FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36];
+1
-1
dll/directx/wine/d3dx9_37/d3dx9_37.spec
+1
-1
dll/directx/wine/d3dx9_37/d3dx9_37.spec
···
269
269
@ stub D3DXSHMultiply6(ptr ptr ptr)
270
270
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
271
271
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
272
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
272
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
273
273
@ stdcall D3DXSHRotate(ptr long ptr ptr)
274
274
@ stdcall D3DXSHRotateZ(ptr long float ptr)
275
275
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_38/d3dx9_38.spec
+1
-1
dll/directx/wine/d3dx9_38/d3dx9_38.spec
···
269
269
@ stub D3DXSHMultiply6(ptr ptr ptr)
270
270
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
271
271
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
272
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
272
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
273
273
@ stdcall D3DXSHRotate(ptr long ptr ptr)
274
274
@ stdcall D3DXSHRotateZ(ptr long float ptr)
275
275
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_39/d3dx9_39.spec
+1
-1
dll/directx/wine/d3dx9_39/d3dx9_39.spec
···
269
269
@ stub D3DXSHMultiply6(ptr ptr ptr)
270
270
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
271
271
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
272
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
272
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
273
273
@ stdcall D3DXSHRotate(ptr long ptr ptr)
274
274
@ stdcall D3DXSHRotateZ(ptr long float ptr)
275
275
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_40/d3dx9_40.spec
+1
-1
dll/directx/wine/d3dx9_40/d3dx9_40.spec
···
269
269
@ stub D3DXSHMultiply6(ptr ptr ptr)
270
270
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
271
271
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
272
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
272
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
273
273
@ stdcall D3DXSHRotate(ptr long ptr ptr)
274
274
@ stdcall D3DXSHRotateZ(ptr long float ptr)
275
275
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_41/d3dx9_41.spec
+1
-1
dll/directx/wine/d3dx9_41/d3dx9_41.spec
···
269
269
@ stub D3DXSHMultiply6(ptr ptr ptr)
270
270
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
271
271
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
272
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
272
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
273
273
@ stdcall D3DXSHRotate(ptr long ptr ptr)
274
274
@ stdcall D3DXSHRotateZ(ptr long float ptr)
275
275
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_42/d3dx9_42.spec
+1
-1
dll/directx/wine/d3dx9_42/d3dx9_42.spec
···
262
262
@ stub D3DXSHMultiply6(ptr ptr ptr)
263
263
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
264
264
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
265
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
265
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
266
266
@ stdcall D3DXSHRotate(ptr long ptr ptr)
267
267
@ stdcall D3DXSHRotateZ(ptr long float ptr)
268
268
@ stdcall D3DXSHScale(ptr long ptr float)
+1
-1
dll/directx/wine/d3dx9_43/d3dx9_43.spec
+1
-1
dll/directx/wine/d3dx9_43/d3dx9_43.spec
···
262
262
@ stub D3DXSHMultiply6(ptr ptr ptr)
263
263
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
264
264
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
265
-
@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
265
+
@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
266
266
@ stdcall D3DXSHRotate(ptr long ptr ptr)
267
267
@ stdcall D3DXSHRotateZ(ptr long float ptr)
268
268
@ stdcall D3DXSHScale(ptr long ptr float)
+1
sdk/include/dxsdk/d3dx9math.h
+1
sdk/include/dxsdk/d3dx9math.h
···
396
396
FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b);
397
397
FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b);
398
398
FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b);
399
+
HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout);
399
400
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in);
400
401
FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in);
401
402
FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);
+297
sdk/tools/winesync/d3dx9_staging/0008-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff
+297
sdk/tools/winesync/d3dx9_staging/0008-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff
···
1
+
diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec
2
+
index a45af880b61..3a043da3cf4 100644
3
+
--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec
4
+
+++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec
5
+
@@ -256,7 +256,7 @@
6
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
7
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
8
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
9
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
10
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
11
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
12
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
13
+
@ stdcall D3DXSHScale(ptr long ptr float)
14
+
diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec
15
+
index 34c31eb7cc2..1a324b611c1 100644
16
+
--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec
17
+
+++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec
18
+
@@ -256,7 +256,7 @@
19
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
20
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
21
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
22
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
23
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
24
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
25
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
26
+
@ stdcall D3DXSHScale(ptr long ptr float)
27
+
diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec
28
+
index f07c188a398..95cc814c497 100644
29
+
--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec
30
+
+++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec
31
+
@@ -260,7 +260,7 @@
32
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
33
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
34
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
35
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
36
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
37
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
38
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
39
+
@ stdcall D3DXSHScale(ptr long ptr float)
40
+
diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec
41
+
index f07c188a398..95cc814c497 100644
42
+
--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec
43
+
+++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec
44
+
@@ -260,7 +260,7 @@
45
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
46
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
47
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
48
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
49
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
50
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
51
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
52
+
@ stdcall D3DXSHScale(ptr long ptr float)
53
+
diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec
54
+
index 77454081317..b258cbab493 100644
55
+
--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec
56
+
+++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec
57
+
@@ -265,7 +265,7 @@
58
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
59
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
60
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
61
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
62
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
63
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
64
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
65
+
@ stdcall D3DXSHScale(ptr long ptr float)
66
+
diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec
67
+
index 77454081317..b258cbab493 100644
68
+
--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec
69
+
+++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec
70
+
@@ -265,7 +265,7 @@
71
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
72
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
73
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
74
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
75
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
76
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
77
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
78
+
@ stdcall D3DXSHScale(ptr long ptr float)
79
+
diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec
80
+
index 72418ac59ab..19871f33abc 100644
81
+
--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec
82
+
+++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec
83
+
@@ -265,7 +265,7 @@
84
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
85
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
86
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
87
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
88
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
89
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
90
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
91
+
@ stdcall D3DXSHScale(ptr long ptr float)
92
+
diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec
93
+
index 12db9be10fc..38714f68127 100644
94
+
--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec
95
+
+++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec
96
+
@@ -262,7 +262,7 @@
97
+
@ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr)
98
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
99
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
100
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
101
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
102
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
103
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
104
+
@ stdcall D3DXSHScale(ptr long ptr float)
105
+
diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec
106
+
index 4e85b4ca2f3..ed8efad9c6c 100644
107
+
--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec
108
+
+++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec
109
+
@@ -267,7 +267,7 @@
110
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
111
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
112
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
113
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
114
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
115
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
116
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
117
+
@ stdcall D3DXSHScale(ptr long ptr float)
118
+
diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec
119
+
index 4e85b4ca2f3..ed8efad9c6c 100644
120
+
--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec
121
+
+++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec
122
+
@@ -267,7 +267,7 @@
123
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
124
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
125
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
126
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
127
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
128
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
129
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
130
+
@ stdcall D3DXSHScale(ptr long ptr float)
131
+
diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec
132
+
index 4e85b4ca2f3..ed8efad9c6c 100644
133
+
--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec
134
+
+++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec
135
+
@@ -267,7 +267,7 @@
136
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
137
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
138
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
139
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
140
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
141
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
142
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
143
+
@ stdcall D3DXSHScale(ptr long ptr float)
144
+
diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec
145
+
index 4e85b4ca2f3..ed8efad9c6c 100644
146
+
--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec
147
+
+++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec
148
+
@@ -267,7 +267,7 @@
149
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
150
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
151
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
152
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
153
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
154
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
155
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
156
+
@ stdcall D3DXSHScale(ptr long ptr float)
157
+
diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec
158
+
index b07809e646c..13405ad8909 100644
159
+
--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec
160
+
+++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec
161
+
@@ -269,7 +269,7 @@
162
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
163
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
164
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
165
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
166
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
167
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
168
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
169
+
@ stdcall D3DXSHScale(ptr long ptr float)
170
+
diff --git a/dll/directx/wine/d3dx9_36/math.c b/dll/directx/wine/d3dx9_36/math.c
171
+
index cdc55feb64f..a575d659fca 100644
172
+
--- a/dll/directx/wine/d3dx9_36/math.c
173
+
+++ b/dll/directx/wine/d3dx9_36/math.c
174
+
@@ -2973,6 +2973,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in)
175
+
out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35];
176
+
}
177
+
178
+
+HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout)
179
+
+{
180
+
+ FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout);
181
+
+
182
+
+ if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER)
183
+
+ return D3DERR_INVALIDCALL;
184
+
+
185
+
+ *rout = 0.0f;
186
+
+ *gout = 0.0f;
187
+
+ *bout = 0.0f;
188
+
+
189
+
+ return D3D_OK;
190
+
+}
191
+
+
192
+
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in)
193
+
{
194
+
FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36];
195
+
diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec
196
+
index b07809e646c..13405ad8909 100644
197
+
--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec
198
+
+++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec
199
+
@@ -269,7 +269,7 @@
200
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
201
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
202
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
203
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
204
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
205
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
206
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
207
+
@ stdcall D3DXSHScale(ptr long ptr float)
208
+
diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec
209
+
index b07809e646c..13405ad8909 100644
210
+
--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec
211
+
+++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec
212
+
@@ -269,7 +269,7 @@
213
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
214
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
215
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
216
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
217
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
218
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
219
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
220
+
@ stdcall D3DXSHScale(ptr long ptr float)
221
+
diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec
222
+
index b07809e646c..13405ad8909 100644
223
+
--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec
224
+
+++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec
225
+
@@ -269,7 +269,7 @@
226
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
227
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
228
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
229
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
230
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
231
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
232
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
233
+
@ stdcall D3DXSHScale(ptr long ptr float)
234
+
diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec
235
+
index b07809e646c..13405ad8909 100644
236
+
--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec
237
+
+++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec
238
+
@@ -269,7 +269,7 @@
239
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
240
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
241
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
242
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
243
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
244
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
245
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
246
+
@ stdcall D3DXSHScale(ptr long ptr float)
247
+
diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec
248
+
index b07809e646c..13405ad8909 100644
249
+
--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec
250
+
+++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec
251
+
@@ -269,7 +269,7 @@
252
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
253
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
254
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
255
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
256
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
257
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
258
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
259
+
@ stdcall D3DXSHScale(ptr long ptr float)
260
+
diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec
261
+
index 288ab27dd5d..1f4cf67c7b2 100644
262
+
--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec
263
+
+++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec
264
+
@@ -262,7 +262,7 @@
265
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
266
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
267
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
268
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
269
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
270
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
271
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
272
+
@ stdcall D3DXSHScale(ptr long ptr float)
273
+
diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec
274
+
index 288ab27dd5d..1f4cf67c7b2 100644
275
+
--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec
276
+
+++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec
277
+
@@ -262,7 +262,7 @@
278
+
@ stub D3DXSHMultiply6(ptr ptr ptr)
279
+
@ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr)
280
+
@ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr)
281
+
-@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
282
+
+@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr)
283
+
@ stdcall D3DXSHRotate(ptr long ptr ptr)
284
+
@ stdcall D3DXSHRotateZ(ptr long float ptr)
285
+
@ stdcall D3DXSHScale(ptr long ptr float)
286
+
diff --git a/sdk/include/dxsdk/d3dx9math.h b/sdk/include/dxsdk/d3dx9math.h
287
+
index 2c41b73d423..7aed21e3ee3 100644
288
+
--- a/sdk/include/dxsdk/d3dx9math.h
289
+
+++ b/sdk/include/dxsdk/d3dx9math.h
290
+
@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA
291
+
FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b);
292
+
FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b);
293
+
FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b);
294
+
+HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout);
295
+
FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in);
296
+
FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in);
297
+
FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);