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
57119a1c
Commit
57119a1c
authored
Feb 23, 2021
by
Henri Verbeet
Committed by
Alexandre Julliard
Feb 23, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Unbind framebuffer state in state_unbind_resources().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
50949c95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
13 deletions
+16
-13
device.c
dlls/wined3d/device.c
+0
-13
stateblock.c
dlls/wined3d/stateblock.c
+16
-0
No files found.
dlls/wined3d/device.c
View file @
57119a1c
...
...
@@ -1196,7 +1196,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
struct
wined3d_resource
*
resource
,
*
cursor
;
struct
wined3d_rendertarget_view
*
view
;
struct
wined3d_texture
*
texture
;
unsigned
int
i
;
TRACE
(
"device %p.
\n
"
,
device
);
...
...
@@ -1224,10 +1223,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
wined3d_cs_emit_reset_state
(
device
->
cs
);
state_cleanup
(
state
);
for
(
i
=
0
;
i
<
device
->
adapter
->
d3d_info
.
limits
.
max_rt_count
;
++
i
)
{
wined3d_device_set_rendertarget_view
(
device
,
i
,
NULL
,
FALSE
);
}
wine_rb_clear
(
&
device
->
samplers
,
device_free_sampler
,
NULL
);
wine_rb_clear
(
&
device
->
rasterizer_states
,
device_free_rasterizer_state
,
NULL
);
...
...
@@ -1243,14 +1238,6 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
device
->
adapter
->
adapter_ops
->
adapter_uninit_3d
(
device
);
device
->
d3d_initialized
=
FALSE
;
if
((
view
=
state
->
fb
.
depth_stencil
))
{
TRACE
(
"Releasing depth/stencil view %p.
\n
"
,
view
);
state
->
fb
.
depth_stencil
=
NULL
;
wined3d_rendertarget_view_decref
(
view
);
}
if
((
view
=
device
->
auto_depth_stencil_view
))
{
device
->
auto_depth_stencil_view
=
NULL
;
...
...
dlls/wined3d/stateblock.c
View file @
57119a1c
...
...
@@ -374,6 +374,7 @@ void state_unbind_resources(struct wined3d_state *state)
struct
wined3d_shader_resource_view
*
srv
;
struct
wined3d_vertex_declaration
*
decl
;
struct
wined3d_blend_state
*
blend_state
;
struct
wined3d_rendertarget_view
*
rtv
;
struct
wined3d_sampler
*
sampler
;
struct
wined3d_texture
*
texture
;
struct
wined3d_buffer
*
buffer
;
...
...
@@ -473,6 +474,21 @@ void state_unbind_resources(struct wined3d_state *state)
state
->
blend_state
=
NULL
;
wined3d_blend_state_decref
(
blend_state
);
}
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
state
->
fb
.
render_targets
);
++
i
)
{
if
((
rtv
=
state
->
fb
.
render_targets
[
i
]))
{
state
->
fb
.
render_targets
[
i
]
=
NULL
;
wined3d_rendertarget_view_decref
(
rtv
);
}
}
if
((
rtv
=
state
->
fb
.
depth_stencil
))
{
state
->
fb
.
depth_stencil
=
NULL
;
wined3d_rendertarget_view_decref
(
rtv
);
}
}
void
wined3d_stateblock_state_cleanup
(
struct
wined3d_stateblock_state
*
state
)
...
...
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