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
0fb06e8a
Commit
0fb06e8a
authored
Dec 22, 2022
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 14, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Rename "is_complex_root" to "is_root".
"is_complex_root" is somewhat misleading, given that it is TRUE for surfaces with no attached surfaces.
parent
916904f4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-1
surface.c
dlls/ddraw/surface.c
+5
-5
No files found.
dlls/ddraw/ddraw_private.h
View file @
0fb06e8a
...
...
@@ -206,7 +206,7 @@ struct ddraw_surface
/* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there,
* but no pointer to prevent temptations to traverse it in the wrong direction.
*/
unsigned
int
is_
complex_
root
:
1
;
unsigned
int
is_root
:
1
;
unsigned
int
is_lost
:
1
;
unsigned
int
sysmem_fallback
:
1
;
...
...
dlls/ddraw/surface.c
View file @
0fb06e8a
...
...
@@ -579,7 +579,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface)
surf
=
surface
->
complex_array
[
i
];
surface
->
complex_array
[
i
]
=
NULL
;
if
(
!
surf
->
is_
complex_
root
)
if
(
!
surf
->
is_root
)
{
struct
ddraw_texture
*
texture
=
wined3d_texture_get_parent
(
surf
->
wined3d_texture
);
struct
wined3d_device
*
wined3d_device
=
texture
->
wined3d_device
;
...
...
@@ -629,7 +629,7 @@ static ULONG ddraw_surface_release_iface(struct ddraw_surface *This)
/* Complex attached surfaces are destroyed implicitly when the root is released */
wined3d_mutex_lock
();
if
(
!
This
->
is_complex
_root
)
if
(
!
This
->
is
_root
)
{
WARN
(
"(%p) Attempt to destroy a surface that is not a complex root
\n
"
,
This
);
wined3d_mutex_unlock
();
...
...
@@ -2628,7 +2628,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO
WARN
(
"Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.
\n
"
);
hr
=
DDERR_INVALIDOBJECT
;
}
else
if
(
!
(
surface
->
surface_desc
.
ddsCaps
.
dwCaps2
&
managed
)
||
!
surface
->
is_
complex_
root
)
else
if
(
!
(
surface
->
surface_desc
.
ddsCaps
.
dwCaps2
&
managed
)
||
!
surface
->
is_root
)
{
WARN
(
"Called on non-managed texture or non-root surface, returning DDERR_INVALIDPARAMS.
\n
"
);
hr
=
DDERR_INVALIDPARAMS
;
...
...
@@ -5001,7 +5001,7 @@ static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD
}
}
if
(
surface
->
is_
complex_
root
)
if
(
surface
->
is_root
)
hr
=
ddraw_surface_set_wined3d_textures_colour_key
(
surface
,
flags
,
color_key
?
(
struct
wined3d_color_key
*
)
&
fixed_color_key
:
NULL
);
...
...
@@ -6641,7 +6641,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
root
=
wined3d_texture_get_sub_resource_parent
(
wined3d_texture
,
0
);
root
->
is_
complex_
root
=
TRUE
;
root
->
is_root
=
TRUE
;
root
->
sysmem_fallback
=
sysmem_fallback
;
texture
->
root
=
root
;
wined3d_device_incref
(
texture
->
wined3d_device
=
ddraw
->
wined3d_device
);
...
...
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