Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
52a0e36a
Commit
52a0e36a
authored
Dec 29, 2023
by
Elizabeth Figura
Committed by
Alexandre Julliard
Jan 12, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Avoid WARN() when failing to allocate a GL BO without a context.
This is normal and expected, and only a concern for performance. Avoid polluting warn+d3d logs.
parent
44aa651d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
adapter_gl.c
dlls/wined3d/adapter_gl.c
+0
-1
device.c
dlls/wined3d/device.c
+4
-1
No files found.
dlls/wined3d/adapter_gl.c
View file @
52a0e36a
...
@@ -4657,7 +4657,6 @@ static bool adapter_gl_alloc_bo(struct wined3d_device *device, struct wined3d_re
...
@@ -4657,7 +4657,6 @@ static bool adapter_gl_alloc_bo(struct wined3d_device *device, struct wined3d_re
if
(
!
(
wined3d_device_gl_create_bo
(
device_gl
,
NULL
,
size
,
binding
,
usage
,
coherent
,
flags
,
bo_gl
)))
if
(
!
(
wined3d_device_gl_create_bo
(
device_gl
,
NULL
,
size
,
binding
,
usage
,
coherent
,
flags
,
bo_gl
)))
{
{
WARN
(
"Failed to create OpenGL buffer.
\n
"
);
heap_free
(
bo_gl
);
heap_free
(
bo_gl
);
return
false
;
return
false
;
}
}
...
...
dlls/wined3d/device.c
View file @
52a0e36a
...
@@ -1130,6 +1130,8 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win
...
@@ -1130,6 +1130,8 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win
{
{
if
((
memory
=
wined3d_device_gl_allocate_memory
(
device_gl
,
context_gl
,
memory_type_idx
,
size
,
&
id
)))
if
((
memory
=
wined3d_device_gl_allocate_memory
(
device_gl
,
context_gl
,
memory_type_idx
,
size
,
&
id
)))
buffer_offset
=
memory
->
offset
;
buffer_offset
=
memory
->
offset
;
else
if
(
!
context_gl
)
WARN_
(
d3d_perf
)(
"Failed to suballocate buffer from the client thread.
\n
"
);
}
}
else
if
(
context_gl
)
else
if
(
context_gl
)
{
{
...
@@ -1139,7 +1141,8 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win
...
@@ -1139,7 +1141,8 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win
if
(
!
id
)
if
(
!
id
)
{
{
WARN
(
"Failed to allocate buffer.
\n
"
);
if
(
context_gl
)
WARN
(
"Failed to allocate buffer.
\n
"
);
return
false
;
return
false
;
}
}
}
}
...
...
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