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
b12cae8c
Commit
b12cae8c
authored
Sep 21, 2022
by
Matteo Bruni
Committed by
Alexandre Julliard
Nov 30, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of a redundant branch.
parent
c1857959
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
device.c
dlls/wined3d/device.c
+4
-6
No files found.
dlls/wined3d/device.c
View file @
b12cae8c
...
@@ -5848,6 +5848,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
...
@@ -5848,6 +5848,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
device_init_swapchain_state
(
device
,
swapchain
);
device_init_swapchain_state
(
device
,
swapchain
);
if
(
wined3d_settings
.
logo
)
if
(
wined3d_settings
.
logo
)
device_load_logo
(
device
,
wined3d_settings
.
logo
);
device_load_logo
(
device
,
wined3d_settings
.
logo
);
hr
=
device
->
adapter
->
adapter_ops
->
adapter_init_3d
(
device
);
}
}
else
else
{
{
...
@@ -5857,12 +5859,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
...
@@ -5857,12 +5859,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
wined3d_device_context_set_depth_stencil_view
(
context
,
view
);
wined3d_device_context_set_depth_stencil_view
(
context
,
view
);
}
}
if
(
reset_state
)
/* All done. There is no need to reload resources or shaders, this will
hr
=
device
->
adapter
->
adapter_ops
->
adapter_init_3d
(
device
);
* happen automatically on the first use. */
/* All done. There is no need to reload resources or shaders, this will happen automatically on the
* first use
*/
return
hr
;
return
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