Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
706ece82
Commit
706ece82
authored
Sep 12, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 12, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: wined3d_device_get_transform() never fails.
parent
f79bbc76
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
13 deletions
+8
-13
device.c
dlls/d3d8/device.c
+2
-3
device.c
dlls/d3d9/device.c
+2
-3
device.c
dlls/ddraw/device.c
+2
-3
device.c
dlls/wined3d/device.c
+1
-3
wined3d.h
include/wine/wined3d.h
+1
-1
No files found.
dlls/d3d8/device.c
View file @
706ece82
...
...
@@ -1276,16 +1276,15 @@ static HRESULT WINAPI d3d8_device_GetTransform(IDirect3DDevice8 *iface,
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
matrix
)
{
struct
d3d8_device
*
device
=
impl_from_IDirect3DDevice8
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, state %#x, matrix %p.
\n
"
,
iface
,
state
,
matrix
);
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock
();
hr
=
wined3d_device_get_transform
(
device
->
wined3d_device
,
state
,
(
struct
wined3d_matrix
*
)
matrix
);
wined3d_device_get_transform
(
device
->
wined3d_device
,
state
,
(
struct
wined3d_matrix
*
)
matrix
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d8_device_MultiplyTransform
(
IDirect3DDevice8
*
iface
,
...
...
dlls/d3d9/device.c
View file @
706ece82
...
...
@@ -1342,16 +1342,15 @@ static HRESULT WINAPI d3d9_device_GetTransform(IDirect3DDevice9Ex *iface,
D3DTRANSFORMSTATETYPE
state
,
D3DMATRIX
*
matrix
)
{
struct
d3d9_device
*
device
=
impl_from_IDirect3DDevice9Ex
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, state %#x, matrix %p.
\n
"
,
iface
,
state
,
matrix
);
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock
();
hr
=
wined3d_device_get_transform
(
device
->
wined3d_device
,
state
,
(
struct
wined3d_matrix
*
)
matrix
);
wined3d_device_get_transform
(
device
->
wined3d_device
,
state
,
(
struct
wined3d_matrix
*
)
matrix
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d9_device_MultiplyTransform
(
IDirect3DDevice9Ex
*
iface
,
...
...
dlls/ddraw/device.c
View file @
706ece82
...
...
@@ -3194,7 +3194,6 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface,
{
struct
d3d_device
*
device
=
impl_from_IDirect3DDevice7
(
iface
);
enum
wined3d_transform_state
wined3d_state
;
HRESULT
hr
;
TRACE
(
"iface %p, state %#x, matrix %p.
\n
"
,
iface
,
state
,
matrix
);
...
...
@@ -3221,10 +3220,10 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface,
/* Note: D3DMATRIX is compatible with struct wined3d_matrix. */
wined3d_mutex_lock
();
hr
=
wined3d_device_get_transform
(
device
->
wined3d_device
,
wined3d_state
,
(
struct
wined3d_matrix
*
)
matrix
);
wined3d_device_get_transform
(
device
->
wined3d_device
,
wined3d_state
,
(
struct
wined3d_matrix
*
)
matrix
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d_device7_GetTransform_FPUSetup
(
IDirect3DDevice7
*
iface
,
...
...
dlls/wined3d/device.c
View file @
706ece82
...
...
@@ -1755,14 +1755,12 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device,
device_invalidate_state
(
device
,
STATE_TRANSFORM
(
d3dts
));
}
HRESULT
CDECL
wined3d_device_get_transform
(
const
struct
wined3d_device
*
device
,
void
CDECL
wined3d_device_get_transform
(
const
struct
wined3d_device
*
device
,
enum
wined3d_transform_state
state
,
struct
wined3d_matrix
*
matrix
)
{
TRACE
(
"device %p, state %s, matrix %p.
\n
"
,
device
,
debug_d3dtstype
(
state
),
matrix
);
*
matrix
=
device
->
stateBlock
->
state
.
transforms
[
state
];
return
WINED3D_OK
;
}
HRESULT
CDECL
wined3d_device_multiply_transform
(
struct
wined3d_device
*
device
,
...
...
include/wine/wined3d.h
View file @
706ece82
...
...
@@ -2162,7 +2162,7 @@ HRESULT __cdecl wined3d_device_get_texture(const struct wined3d_device *device,
UINT
stage
,
struct
wined3d_texture
**
texture
);
HRESULT
__cdecl
wined3d_device_get_texture_stage_state
(
const
struct
wined3d_device
*
device
,
UINT
stage
,
enum
wined3d_texture_stage_state
state
,
DWORD
*
value
);
HRESULT
__cdecl
wined3d_device_get_transform
(
const
struct
wined3d_device
*
device
,
void
__cdecl
wined3d_device_get_transform
(
const
struct
wined3d_device
*
device
,
enum
wined3d_transform_state
state
,
struct
wined3d_matrix
*
matrix
);
HRESULT
__cdecl
wined3d_device_get_vertex_declaration
(
const
struct
wined3d_device
*
device
,
struct
wined3d_vertex_declaration
**
declaration
);
...
...
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