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
64aae8cf
Commit
64aae8cf
authored
Sep 08, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 10, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: wined3d_device_set_viewport() never fails.
parent
739e302e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
14 deletions
+9
-14
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
+2
-4
wined3d.h
include/wine/wined3d.h
+1
-1
No files found.
dlls/d3d8/device.c
View file @
64aae8cf
...
...
@@ -1308,16 +1308,15 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface,
static
HRESULT
WINAPI
d3d8_device_SetViewport
(
IDirect3DDevice8
*
iface
,
const
D3DVIEWPORT8
*
viewport
)
{
struct
d3d8_device
*
device
=
impl_from_IDirect3DDevice8
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, viewport %p.
\n
"
,
iface
,
viewport
);
/* Note: D3DVIEWPORT8 is compatible with struct wined3d_viewport. */
wined3d_mutex_lock
();
hr
=
wined3d_device_set_viewport
(
device
->
wined3d_device
,
(
const
struct
wined3d_viewport
*
)
viewport
);
wined3d_device_set_viewport
(
device
->
wined3d_device
,
(
const
struct
wined3d_viewport
*
)
viewport
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d8_device_GetViewport
(
IDirect3DDevice8
*
iface
,
D3DVIEWPORT8
*
viewport
)
...
...
dlls/d3d9/device.c
View file @
64aae8cf
...
...
@@ -1374,16 +1374,15 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface,
static
HRESULT
WINAPI
d3d9_device_SetViewport
(
IDirect3DDevice9Ex
*
iface
,
const
D3DVIEWPORT9
*
viewport
)
{
struct
d3d9_device
*
device
=
impl_from_IDirect3DDevice9Ex
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, viewport %p.
\n
"
,
iface
,
viewport
);
/* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */
wined3d_mutex_lock
();
hr
=
wined3d_device_set_viewport
(
device
->
wined3d_device
,
(
const
struct
wined3d_viewport
*
)
viewport
);
wined3d_device_set_viewport
(
device
->
wined3d_device
,
(
const
struct
wined3d_viewport
*
)
viewport
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d9_device_GetViewport
(
IDirect3DDevice9Ex
*
iface
,
D3DVIEWPORT9
*
viewport
)
...
...
dlls/ddraw/device.c
View file @
64aae8cf
...
...
@@ -4992,7 +4992,6 @@ static HRESULT WINAPI d3d_device7_Clear_FPUPreserve(IDirect3DDevice7 *iface, DWO
static
HRESULT
d3d_device7_SetViewport
(
IDirect3DDevice7
*
iface
,
D3DVIEWPORT7
*
viewport
)
{
struct
d3d_device
*
device
=
impl_from_IDirect3DDevice7
(
iface
);
HRESULT
hr
;
TRACE
(
"iface %p, viewport %p.
\n
"
,
iface
,
viewport
);
...
...
@@ -5001,10 +5000,10 @@ static HRESULT d3d_device7_SetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi
/* Note: D3DVIEWPORT7 is compatible with struct wined3d_viewport. */
wined3d_mutex_lock
();
hr
=
wined3d_device_set_viewport
(
device
->
wined3d_device
,
(
struct
wined3d_viewport
*
)
viewport
);
wined3d_device_set_viewport
(
device
->
wined3d_device
,
(
struct
wined3d_viewport
*
)
viewport
);
wined3d_mutex_unlock
();
return
hr
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
d3d_device7_SetViewport_FPUSetup
(
IDirect3DDevice7
*
iface
,
D3DVIEWPORT7
*
viewport
)
...
...
dlls/wined3d/device.c
View file @
64aae8cf
...
...
@@ -2291,7 +2291,7 @@ INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *devi
return
device
->
stateBlock
->
state
.
base_vertex_index
;
}
HRESULT
CDECL
wined3d_device_set_viewport
(
struct
wined3d_device
*
device
,
const
struct
wined3d_viewport
*
viewport
)
void
CDECL
wined3d_device_set_viewport
(
struct
wined3d_device
*
device
,
const
struct
wined3d_viewport
*
viewport
)
{
TRACE
(
"device %p, viewport %p.
\n
"
,
device
,
viewport
);
TRACE
(
"x %u, y %u, w %u, h %u, min_z %.8e, max_z %.8e.
\n
"
,
...
...
@@ -2304,12 +2304,10 @@ HRESULT CDECL wined3d_device_set_viewport(struct wined3d_device *device, const s
if
(
device
->
isRecordingState
)
{
TRACE
(
"Recording... not performing anything
\n
"
);
return
WINED3D_OK
;
return
;
}
device_invalidate_state
(
device
,
STATE_VIEWPORT
);
return
WINED3D_OK
;
}
HRESULT
CDECL
wined3d_device_get_viewport
(
const
struct
wined3d_device
*
device
,
struct
wined3d_viewport
*
viewport
)
...
...
include/wine/wined3d.h
View file @
64aae8cf
...
...
@@ -2239,7 +2239,7 @@ HRESULT __cdecl wined3d_device_set_transform(struct wined3d_device *device,
HRESULT
__cdecl
wined3d_device_set_vertex_declaration
(
struct
wined3d_device
*
device
,
struct
wined3d_vertex_declaration
*
declaration
);
HRESULT
__cdecl
wined3d_device_set_vertex_shader
(
struct
wined3d_device
*
device
,
struct
wined3d_shader
*
shader
);
HRESULT
__cdecl
wined3d_device_set_viewport
(
struct
wined3d_device
*
device
,
const
struct
wined3d_viewport
*
viewport
);
void
__cdecl
wined3d_device_set_viewport
(
struct
wined3d_device
*
device
,
const
struct
wined3d_viewport
*
viewport
);
HRESULT
__cdecl
wined3d_device_set_vs_consts_b
(
struct
wined3d_device
*
device
,
UINT
start_register
,
const
BOOL
*
constants
,
UINT
bool_count
);
HRESULT
__cdecl
wined3d_device_set_vs_consts_f
(
struct
wined3d_device
*
device
,
...
...
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