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
38f3d59e
Commit
38f3d59e
authored
Jul 08, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Send resource destruction through the command stream.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8cb66987
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
device.c
dlls/wined3d/device.c
+0
-2
resource.c
dlls/wined3d/resource.c
+9
-2
No files found.
dlls/wined3d/device.c
View file @
38f3d59e
...
...
@@ -4993,8 +4993,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso
TRACE
(
"device %p, resource %p, type %s.
\n
"
,
device
,
resource
,
debug_d3dresourcetype
(
type
));
context_resource_released
(
device
,
resource
,
type
);
for
(
i
=
0
;
i
<
device
->
adapter
->
gl_info
.
limits
.
buffers
;
++
i
)
{
if
((
rtv
=
device
->
fb
.
render_targets
[
i
])
&&
rtv
->
resource
==
resource
)
...
...
dlls/wined3d/resource.c
View file @
38f3d59e
...
...
@@ -233,6 +233,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *
return
WINED3D_OK
;
}
static
void
wined3d_resource_destroy_object
(
void
*
object
)
{
struct
wined3d_resource
*
resource
=
object
;
wined3d_resource_free_sysmem
(
resource
);
context_resource_released
(
resource
->
device
,
resource
,
resource
->
type
);
}
void
resource_cleanup
(
struct
wined3d_resource
*
resource
)
{
const
struct
wined3d
*
d3d
=
resource
->
device
->
wined3d
;
...
...
@@ -245,9 +253,8 @@ void resource_cleanup(struct wined3d_resource *resource)
adapter_adjust_memory
(
resource
->
device
->
adapter
,
(
INT64
)
0
-
resource
->
size
);
}
wined3d_resource_free_sysmem
(
resource
);
device_resource_released
(
resource
->
device
,
resource
);
wined3d_cs_emit_destroy_object
(
resource
->
device
->
cs
,
wined3d_resource_destroy_object
,
resource
);
}
void
resource_unload
(
struct
wined3d_resource
*
resource
)
...
...
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