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
d607586d
Commit
d607586d
authored
Oct 18, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Oct 19, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Make the present_parameters parameter to wined3d_device_reset() const.
parent
30428604
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
34 deletions
+3
-34
device.c
dlls/d3d8/device.c
+0
-14
device.c
dlls/d3d9/device.c
+1
-18
device.c
dlls/wined3d/device.c
+1
-1
wined3d.h
include/wine/wined3d.h
+1
-1
No files found.
dlls/d3d8/device.c
View file @
d607586d
...
@@ -596,20 +596,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface,
...
@@ -596,20 +596,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface,
}
}
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
pPresentationParameters
->
BackBufferWidth
=
localParameters
.
BackBufferWidth
;
pPresentationParameters
->
BackBufferHeight
=
localParameters
.
BackBufferHeight
;
pPresentationParameters
->
BackBufferFormat
=
d3dformat_from_wined3dformat
(
localParameters
.
BackBufferFormat
);
pPresentationParameters
->
BackBufferCount
=
localParameters
.
BackBufferCount
;
pPresentationParameters
->
MultiSampleType
=
localParameters
.
MultiSampleType
;
pPresentationParameters
->
SwapEffect
=
localParameters
.
SwapEffect
;
pPresentationParameters
->
hDeviceWindow
=
localParameters
.
hDeviceWindow
;
pPresentationParameters
->
Windowed
=
localParameters
.
Windowed
;
pPresentationParameters
->
EnableAutoDepthStencil
=
localParameters
.
EnableAutoDepthStencil
;
pPresentationParameters
->
AutoDepthStencilFormat
=
d3dformat_from_wined3dformat
(
localParameters
.
AutoDepthStencilFormat
);
pPresentationParameters
->
Flags
=
localParameters
.
Flags
;
pPresentationParameters
->
FullScreen_RefreshRateInHz
=
localParameters
.
FullScreen_RefreshRateInHz
;
pPresentationParameters
->
FullScreen_PresentationInterval
=
localParameters
.
PresentationInterval
;
return
hr
;
return
hr
;
}
}
...
...
dlls/d3d9/device.c
View file @
d607586d
...
@@ -582,26 +582,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevi
...
@@ -582,26 +582,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevi
hr
=
wined3d_device_reset
(
This
->
wined3d_device
,
&
localParameters
,
reset_enum_callback
);
hr
=
wined3d_device_reset
(
This
->
wined3d_device
,
&
localParameters
,
reset_enum_callback
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
This
->
notreset
=
TRUE
;
This
->
notreset
=
TRUE
;
else
pPresentationParameters
->
BackBufferWidth
=
localParameters
.
BackBufferWidth
;
pPresentationParameters
->
BackBufferHeight
=
localParameters
.
BackBufferHeight
;
pPresentationParameters
->
BackBufferFormat
=
d3dformat_from_wined3dformat
(
localParameters
.
BackBufferFormat
);
pPresentationParameters
->
BackBufferCount
=
localParameters
.
BackBufferCount
;
pPresentationParameters
->
MultiSampleType
=
localParameters
.
MultiSampleType
;
pPresentationParameters
->
MultiSampleQuality
=
localParameters
.
MultiSampleQuality
;
pPresentationParameters
->
SwapEffect
=
localParameters
.
SwapEffect
;
pPresentationParameters
->
hDeviceWindow
=
localParameters
.
hDeviceWindow
;
pPresentationParameters
->
Windowed
=
localParameters
.
Windowed
;
pPresentationParameters
->
EnableAutoDepthStencil
=
localParameters
.
EnableAutoDepthStencil
;
pPresentationParameters
->
AutoDepthStencilFormat
=
d3dformat_from_wined3dformat
(
localParameters
.
AutoDepthStencilFormat
);
pPresentationParameters
->
Flags
=
localParameters
.
Flags
;
pPresentationParameters
->
FullScreen_RefreshRateInHz
=
localParameters
.
FullScreen_RefreshRateInHz
;
pPresentationParameters
->
PresentationInterval
=
localParameters
.
PresentationInterval
;
}
else
{
This
->
notreset
=
FALSE
;
This
->
notreset
=
FALSE
;
}
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
...
...
dlls/wined3d/device.c
View file @
d607586d
...
@@ -5524,7 +5524,7 @@ err:
...
@@ -5524,7 +5524,7 @@ err:
/* Do not call while under the GL lock. */
/* Do not call while under the GL lock. */
HRESULT
CDECL
wined3d_device_reset
(
struct
wined3d_device
*
device
,
HRESULT
CDECL
wined3d_device_reset
(
struct
wined3d_device
*
device
,
WINED3DPRESENT_PARAMETERS
*
present_parameters
,
const
WINED3DPRESENT_PARAMETERS
*
present_parameters
,
wined3d_device_reset_cb
callback
)
wined3d_device_reset_cb
callback
)
{
{
struct
wined3d_resource
*
resource
,
*
cursor
;
struct
wined3d_resource
*
resource
,
*
cursor
;
...
...
include/wine/wined3d.h
View file @
d607586d
...
@@ -2282,7 +2282,7 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,
...
@@ -2282,7 +2282,7 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,
const
struct
wined3d_vertex_declaration
*
declaration
,
DWORD
flags
,
DWORD
dst_fvf
);
const
struct
wined3d_vertex_declaration
*
declaration
,
DWORD
flags
,
DWORD
dst_fvf
);
void
__cdecl
wined3d_device_release_focus_window
(
struct
wined3d_device
*
device
);
void
__cdecl
wined3d_device_release_focus_window
(
struct
wined3d_device
*
device
);
HRESULT
__cdecl
wined3d_device_reset
(
struct
wined3d_device
*
device
,
HRESULT
__cdecl
wined3d_device_reset
(
struct
wined3d_device
*
device
,
WINED3DPRESENT_PARAMETERS
*
present_parameters
,
wined3d_device_reset_cb
callback
);
const
WINED3DPRESENT_PARAMETERS
*
present_parameters
,
wined3d_device_reset_cb
callback
);
void
__cdecl
wined3d_device_restore_fullscreen_window
(
struct
wined3d_device
*
device
,
HWND
window
);
void
__cdecl
wined3d_device_restore_fullscreen_window
(
struct
wined3d_device
*
device
,
HWND
window
);
HRESULT
__cdecl
wined3d_device_set_base_vertex_index
(
struct
wined3d_device
*
device
,
INT
base_index
);
HRESULT
__cdecl
wined3d_device_set_base_vertex_index
(
struct
wined3d_device
*
device
,
INT
base_index
);
HRESULT
__cdecl
wined3d_device_set_clip_plane
(
struct
wined3d_device
*
device
,
UINT
plane_idx
,
const
float
*
plane
);
HRESULT
__cdecl
wined3d_device_set_clip_plane
(
struct
wined3d_device
*
device
,
UINT
plane_idx
,
const
float
*
plane
);
...
...
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