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
4e755d26
Commit
4e755d26
authored
Aug 26, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 26, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Make stateblock_unbind_resources() work with a wined3d_state structure instead.
parent
f02a5f45
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
device.c
dlls/wined3d/device.c
+2
-2
stateblock.c
dlls/wined3d/stateblock.c
+2
-3
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-1
No files found.
dlls/wined3d/device.c
View file @
4e755d26
...
...
@@ -1285,7 +1285,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device)
if
(
device
->
logo_surface
)
wined3d_surface_decref
(
device
->
logo_surface
);
state
block_unbind_resources
(
device
->
stateBlock
);
state
_unbind_resources
(
&
device
->
stateBlock
->
state
);
/* Unload resources */
LIST_FOR_EACH_ENTRY_SAFE
(
resource
,
cursor
,
&
device
->
resources
,
struct
wined3d_resource
,
resource_list_entry
)
...
...
@@ -4917,7 +4917,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
}
if
(
reset_state
)
state
block_unbind_resources
(
device
->
stateBlock
);
state
_unbind_resources
(
&
device
->
stateBlock
->
state
);
if
(
device
->
fb
.
render_targets
)
{
...
...
dlls/wined3d/stateblock.c
View file @
4e755d26
...
...
@@ -467,9 +467,8 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock)
return
refcount
;
}
void
state
block_unbind_resources
(
struct
wined3d_stateblock
*
stateblock
)
void
state
_unbind_resources
(
struct
wined3d_state
*
state
)
{
struct
wined3d_state
*
state
=
&
stateblock
->
state
;
struct
wined3d_vertex_declaration
*
decl
;
struct
wined3d_sampler
*
sampler
;
struct
wined3d_texture
*
texture
;
...
...
@@ -599,7 +598,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock)
{
int
counter
;
state
block_unbind_resources
(
stateblock
);
state
_unbind_resources
(
&
stateblock
->
state
);
for
(
counter
=
0
;
counter
<
LIGHTMAP_SIZE
;
++
counter
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
4e755d26
...
...
@@ -2446,7 +2446,8 @@ struct wined3d_stateblock
void
stateblock_init_contained_states
(
struct
wined3d_stateblock
*
stateblock
)
DECLSPEC_HIDDEN
;
void
stateblock_init_default_state
(
struct
wined3d_stateblock
*
stateblock
)
DECLSPEC_HIDDEN
;
void
stateblock_unbind_resources
(
struct
wined3d_stateblock
*
stateblock
)
DECLSPEC_HIDDEN
;
void
state_unbind_resources
(
struct
wined3d_state
*
state
)
DECLSPEC_HIDDEN
;
/* Direct3D terminology with little modifications. We do not have an issued state
* because only the driver knows about it, but we have a created state because d3d
...
...
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