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
4144f2e8
Commit
4144f2e8
authored
Mar 13, 2023
by
Henri Verbeet
Committed by
Alexandre Julliard
Mar 14, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Don't bother explicitly terminating the GLSL info log in print_glsl_info_log().
parent
67c67703
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
8 deletions
+28
-8
glsl_shader.c
dlls/wined3d/glsl_shader.c
+14
-8
wined3d_private.h
dlls/wined3d/wined3d_private.h
+14
-0
No files found.
dlls/wined3d/glsl_shader.c
View file @
4144f2e8
...
...
@@ -518,29 +518,35 @@ void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL
* that if there are errors. */
if
(
length
>
1
)
{
const
char
*
ptr
,
*
line
;
const
char
*
ptr
,
*
end
,
*
line
;
log
=
heap_alloc
(
length
);
/* The info log is supposed to be zero-terminated, but at least some
* versions of fglrx don't terminate the string properly. The reported
* length does include the terminator, so explicitly set it to zero
* here. */
log
[
length
-
1
]
=
0
;
if
(
program
)
GL_EXTCALL
(
glGetProgramInfoLog
(
id
,
length
,
NULL
,
log
));
else
GL_EXTCALL
(
glGetShaderInfoLog
(
id
,
length
,
NULL
,
log
));
ptr
=
log
;
/* The info log is supposed to be zero-terminated. Note that at least
* some versions of fglrx don't terminate the string properly. The
* reported length does include the supposed terminator though, so we
* don't care here. */
end
=
&
ptr
[
length
-
1
];
if
(
gl_info
->
quirks
&
WINED3D_QUIRK_INFO_LOG_SPAM
)
{
WARN
(
"Info log received from GLSL shader #%u:
\n
"
,
id
);
while
((
line
=
get_info_log_line
(
&
ptr
)))
WARN
(
" %.*s"
,
(
int
)(
ptr
-
line
),
line
);
while
((
line
=
wined3d_get_line
(
&
ptr
,
end
)))
{
WARN
(
" %.*s"
,
(
int
)(
ptr
-
line
),
line
);
}
}
else
{
FIXME
(
"Info log received from GLSL shader #%u:
\n
"
,
id
);
while
((
line
=
get_info_log_line
(
&
ptr
)))
FIXME
(
" %.*s"
,
(
int
)(
ptr
-
line
),
line
);
while
((
line
=
wined3d_get_line
(
&
ptr
,
end
)))
{
FIXME
(
" %.*s"
,
(
int
)(
ptr
-
line
),
line
);
}
}
heap_free
(
log
);
}
...
...
dlls/wined3d/wined3d_private.h
View file @
4144f2e8
...
...
@@ -74,6 +74,20 @@ static inline float int_to_float(uint32_t i)
return
u
.
f
;
}
static
inline
const
char
*
wined3d_get_line
(
const
char
**
ptr
,
const
char
*
end
)
{
const
char
*
p
,
*
q
;
if
((
p
=
*
ptr
)
>=
end
)
return
NULL
;
if
(
!
(
q
=
memchr
(
p
,
'\n'
,
end
-
p
)))
*
ptr
=
end
;
else
*
ptr
=
q
+
1
;
return
p
;
}
#define MAKEDWORD_VERSION(maj, min) (((maj & 0xffffu) << 16) | (min & 0xffffu))
/* Driver quirks */
...
...
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