Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
878bcb51
Commit
878bcb51
authored
Jul 17, 2009
by
David Adam
Committed by
Alexandre Julliard
Jul 20, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Fix D3DXVec3TransformCoord to make tests pass in Windows.
parent
e37aff31
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
19 deletions
+6
-19
math.c
dlls/d3dx9_36/math.c
+5
-13
math.c
dlls/d3dx9_36/tests/math.c
+1
-6
No files found.
dlls/d3dx9_36/math.c
View file @
878bcb51
...
...
@@ -1598,20 +1598,12 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoord(D3DXVECTOR3 *pout, CONST D3DXVECTOR3
norm
=
pm
->
u
.
m
[
0
][
3
]
*
pv
->
x
+
pm
->
u
.
m
[
1
][
3
]
*
pv
->
y
+
pm
->
u
.
m
[
2
][
3
]
*
pv
->
z
+
pm
->
u
.
m
[
3
][
3
];
if
(
norm
)
{
CONST
D3DXVECTOR3
v
=
*
pv
;
out
.
x
=
(
pm
->
u
.
m
[
0
][
0
]
*
v
.
x
+
pm
->
u
.
m
[
1
][
0
]
*
v
.
y
+
pm
->
u
.
m
[
2
][
0
]
*
v
.
z
+
pm
->
u
.
m
[
3
][
0
])
/
norm
;
out
.
y
=
(
pm
->
u
.
m
[
0
][
1
]
*
v
.
x
+
pm
->
u
.
m
[
1
][
1
]
*
v
.
y
+
pm
->
u
.
m
[
2
][
1
]
*
v
.
z
+
pm
->
u
.
m
[
3
][
1
])
/
norm
;
out
.
z
=
(
pm
->
u
.
m
[
0
][
2
]
*
v
.
x
+
pm
->
u
.
m
[
1
][
2
]
*
v
.
y
+
pm
->
u
.
m
[
2
][
2
]
*
v
.
z
+
pm
->
u
.
m
[
3
][
2
])
/
norm
;
}
else
{
out
.
x
=
0
.
0
f
;
out
.
y
=
0
.
0
f
;
out
.
z
=
0
.
0
f
;
}
out
.
x
=
(
pm
->
u
.
m
[
0
][
0
]
*
pv
->
x
+
pm
->
u
.
m
[
1
][
0
]
*
pv
->
y
+
pm
->
u
.
m
[
2
][
0
]
*
pv
->
z
+
pm
->
u
.
m
[
3
][
0
])
/
norm
;
out
.
y
=
(
pm
->
u
.
m
[
0
][
1
]
*
pv
->
x
+
pm
->
u
.
m
[
1
][
1
]
*
pv
->
y
+
pm
->
u
.
m
[
2
][
1
]
*
pv
->
z
+
pm
->
u
.
m
[
3
][
1
])
/
norm
;
out
.
z
=
(
pm
->
u
.
m
[
0
][
2
]
*
pv
->
x
+
pm
->
u
.
m
[
1
][
2
]
*
pv
->
y
+
pm
->
u
.
m
[
2
][
2
]
*
pv
->
z
+
pm
->
u
.
m
[
3
][
2
])
/
norm
;
*
pout
=
out
;
return
pout
;
}
...
...
dlls/d3dx9_36/tests/math.c
View file @
878bcb51
...
...
@@ -1115,7 +1115,7 @@ static void D3DXVector2Test(void)
static
void
D3DXVector3Test
(
void
)
{
D3DVIEWPORT9
viewport
;
D3DXVECTOR3
expectedvec
,
gotvec
,
nul
,
nulproj
,
u
,
v
,
w
,
x
;
D3DXVECTOR3
expectedvec
,
gotvec
,
nul
,
u
,
v
,
w
,
x
;
LPD3DXVECTOR3
funcpointer
;
D3DXVECTOR4
expectedtrans
,
gottrans
;
D3DXMATRIX
mat
,
projection
,
view
,
world
;
...
...
@@ -1290,11 +1290,6 @@ static void D3DXVector3Test(void)
expectedvec
.
x
=
70
.
0
f
/
124
.
0
f
;
expectedvec
.
y
=
88
.
0
f
/
124
.
0
f
;
expectedvec
.
z
=
106
.
0
f
/
124
.
0
f
;
D3DXVec3TransformCoord
(
&
gotvec
,
&
u
,
&
mat
);
expect_vec3
(
expectedvec
,
gotvec
);
/* Test the nul projected vector */
nulproj
.
x
=
1
.
0
f
;
nulproj
.
y
=
-
1
.
0
f
,
nulproj
.
z
=
-
1
.
0
f
;
expectedvec
.
x
=
0
.
0
f
;
expectedvec
.
y
=
0
.
0
f
;
expectedvec
.
z
=
0
.
0
f
;
D3DXVec3TransformCoord
(
&
gotvec
,
&
nulproj
,
&
mat
);
expect_vec3
(
expectedvec
,
gotvec
);
/*_______________D3DXVec3TransformNormal______________________*/
expectedvec
.
x
=
57
.
0
f
;
expectedvec
.
y
=
74
.
0
f
;
expectedvec
.
z
=
91
.
0
f
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment