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
162fc7bd
Commit
162fc7bd
authored
Jan 24, 2022
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Properly compare integers in wined3d_bo_slab_vk_compare().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
18a6d9ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
context_vk.c
dlls/wined3d/context_vk.c
+6
-5
wined3d_private.h
dlls/wined3d/wined3d_private.h
+5
-0
No files found.
dlls/wined3d/context_vk.c
View file @
162fc7bd
...
...
@@ -1883,12 +1883,13 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr
{
const
struct
wined3d_bo_slab_vk
*
slab
=
WINE_RB_ENTRY_VALUE
(
entry
,
const
struct
wined3d_bo_slab_vk
,
entry
);
const
struct
wined3d_bo_slab_vk_key
*
k
=
key
;
int
ret
;
if
(
k
->
memory_type
!=
slab
->
requested_memory_type
)
return
k
->
memory_type
-
slab
->
requested_memory_type
;
if
(
k
->
usage
!=
slab
->
bo
.
usage
)
return
k
->
usage
-
slab
->
bo
.
usage
;
return
k
->
size
-
slab
->
bo
.
size
;
if
(
(
ret
=
wined3d_uint32_compare
(
k
->
memory_type
,
slab
->
requested_memory_type
))
)
return
ret
;
if
(
(
ret
=
wined3d_uint32_compare
(
k
->
usage
,
slab
->
bo
.
usage
))
)
return
ret
;
return
wined3d_uint64_compare
(
k
->
size
,
slab
->
bo
.
size
)
;
}
static
void
wined3d_context_vk_init_graphics_pipeline_key
(
struct
wined3d_context_vk
*
context_vk
)
...
...
dlls/wined3d/wined3d_private.h
View file @
162fc7bd
...
...
@@ -452,6 +452,11 @@ static inline int wined3d_uint32_compare(uint32_t x, uint32_t y)
return
(
x
>
y
)
-
(
x
<
y
);
}
static
inline
int
wined3d_uint64_compare
(
uint64_t
x
,
uint64_t
y
)
{
return
(
x
>
y
)
-
(
x
<
y
);
}
#define ORM_BACKBUFFER 0
#define ORM_FBO 1
...
...
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