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
f8690a6b
Commit
f8690a6b
authored
Oct 21, 2010
by
David Adam
Committed by
Alexandre Julliard
Oct 21, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Remove a useless function.
parent
5f845d3b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
28 deletions
+2
-28
ddraw_private.h
dlls/ddraw/ddraw_private.h
+0
-2
device.c
dlls/ddraw/device.c
+2
-2
utils.c
dlls/ddraw/utils.c
+0
-24
No files found.
dlls/ddraw/ddraw_private.h
View file @
f8690a6b
...
...
@@ -653,8 +653,6 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN;
* IDirect3DExecuteBuffer isn't in WineD3D */
void
multiply_matrix
(
LPD3DMATRIX
dest
,
const
D3DMATRIX
*
src1
,
const
D3DMATRIX
*
src2
)
DECLSPEC_HIDDEN
;
void
multiply_matrix_D3D_way
(
LPD3DMATRIX
result
,
const
D3DMATRIX
*
m1
,
const
D3DMATRIX
*
m2
)
DECLSPEC_HIDDEN
;
/* Helper function in main.c */
BOOL
LoadWineD3D
(
void
)
DECLSPEC_HIDDEN
;
...
...
dlls/ddraw/device.c
View file @
f8690a6b
...
...
@@ -4502,11 +4502,11 @@ IDirect3DDeviceImpl_7_ComputeSphereVisibility(IDirect3DDevice7 *iface,
if
(
hr
!=
DD_OK
)
return
DDERR_INVALIDPARAMS
;
hr
=
IDirect3DDeviceImpl_7_GetTransform
(
iface
,
D3DTRANSFORMSTATE_VIEW
,
&
temp
);
if
(
hr
!=
DD_OK
)
return
DDERR_INVALIDPARAMS
;
multiply_matrix
_D3D_way
(
&
m
,
&
m
,
&
temp
);
multiply_matrix
(
&
m
,
&
temp
,
&
m
);
hr
=
IDirect3DDeviceImpl_7_GetTransform
(
iface
,
D3DTRANSFORMSTATE_PROJECTION
,
&
temp
);
if
(
hr
!=
DD_OK
)
return
DDERR_INVALIDPARAMS
;
multiply_matrix
_D3D_way
(
&
m
,
&
m
,
&
temp
);
multiply_matrix
(
&
m
,
&
temp
,
&
m
);
/* Left plane */
vec
[
0
].
u1
.
x
=
m
.
_14
+
m
.
_11
;
...
...
dlls/ddraw/utils.c
View file @
f8690a6b
...
...
@@ -1172,30 +1172,6 @@ multiply_matrix(D3DMATRIX *dest,
memcpy
(
dest
,
&
temp
,
16
*
sizeof
(
D3DVALUE
));
}
void
multiply_matrix_D3D_way
(
D3DMATRIX
*
result
,
const
D3DMATRIX
*
m1
,
const
D3DMATRIX
*
m2
)
{
D3DMATRIX
temp
;
temp
.
_11
=
m1
->
_11
*
m2
->
_11
+
m1
->
_12
*
m2
->
_21
+
m1
->
_13
*
m2
->
_31
+
m1
->
_14
*
m2
->
_41
;
temp
.
_12
=
m1
->
_11
*
m2
->
_12
+
m1
->
_12
*
m2
->
_22
+
m1
->
_13
*
m2
->
_32
+
m1
->
_14
*
m2
->
_42
;
temp
.
_13
=
m1
->
_11
*
m2
->
_13
+
m1
->
_12
*
m2
->
_23
+
m1
->
_13
*
m2
->
_33
+
m1
->
_14
*
m2
->
_43
;
temp
.
_14
=
m1
->
_11
*
m2
->
_14
+
m1
->
_12
*
m2
->
_24
+
m1
->
_13
*
m2
->
_34
+
m1
->
_14
*
m2
->
_44
;
temp
.
_21
=
m1
->
_21
*
m2
->
_11
+
m1
->
_22
*
m2
->
_21
+
m1
->
_23
*
m2
->
_31
+
m1
->
_24
*
m2
->
_41
;
temp
.
_22
=
m1
->
_21
*
m2
->
_12
+
m1
->
_22
*
m2
->
_22
+
m1
->
_23
*
m2
->
_32
+
m1
->
_24
*
m2
->
_42
;
temp
.
_23
=
m1
->
_21
*
m2
->
_13
+
m1
->
_22
*
m2
->
_23
+
m1
->
_23
*
m2
->
_33
+
m1
->
_24
*
m2
->
_43
;
temp
.
_24
=
m1
->
_21
*
m2
->
_14
+
m1
->
_22
*
m2
->
_24
+
m1
->
_23
*
m2
->
_34
+
m1
->
_24
*
m2
->
_44
;
temp
.
_31
=
m1
->
_31
*
m2
->
_11
+
m1
->
_32
*
m2
->
_21
+
m1
->
_33
*
m2
->
_31
+
m1
->
_34
*
m2
->
_41
;
temp
.
_32
=
m1
->
_31
*
m2
->
_12
+
m1
->
_32
*
m2
->
_22
+
m1
->
_33
*
m2
->
_32
+
m1
->
_34
*
m2
->
_42
;
temp
.
_33
=
m1
->
_31
*
m2
->
_13
+
m1
->
_32
*
m2
->
_23
+
m1
->
_33
*
m2
->
_33
+
m1
->
_34
*
m2
->
_43
;
temp
.
_34
=
m1
->
_31
*
m2
->
_14
+
m1
->
_32
*
m2
->
_24
+
m1
->
_33
*
m2
->
_34
+
m1
->
_34
*
m2
->
_44
;
temp
.
_41
=
m1
->
_41
*
m2
->
_11
+
m1
->
_42
*
m2
->
_21
+
m1
->
_43
*
m2
->
_31
+
m1
->
_44
*
m2
->
_41
;
temp
.
_42
=
m1
->
_41
*
m2
->
_12
+
m1
->
_42
*
m2
->
_22
+
m1
->
_43
*
m2
->
_32
+
m1
->
_44
*
m2
->
_42
;
temp
.
_43
=
m1
->
_41
*
m2
->
_13
+
m1
->
_42
*
m2
->
_23
+
m1
->
_43
*
m2
->
_33
+
m1
->
_44
*
m2
->
_43
;
temp
.
_44
=
m1
->
_41
*
m2
->
_14
+
m1
->
_42
*
m2
->
_24
+
m1
->
_43
*
m2
->
_34
+
m1
->
_44
*
m2
->
_44
;
*
result
=
temp
;
}
HRESULT
hr_ddraw_from_wined3d
(
HRESULT
hr
)
{
...
...
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