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
2153b4d9
Commit
2153b4d9
authored
May 26, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
May 26, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Split the info log into separate lines.
parent
1d7845dd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
4 deletions
+31
-4
glsl_shader.c
dlls/wined3d/glsl_shader.c
+31
-4
No files found.
dlls/wined3d/glsl_shader.c
View file @
2153b4d9
...
...
@@ -122,6 +122,24 @@ typedef struct {
struct
vs_compile_args
vs_args
;
}
glsl_program_key_t
;
/* Extract a line from the info log.
* Note that this modifies the source string. */
static
char
*
get_info_log_line
(
char
**
ptr
)
{
char
*
p
,
*
q
;
p
=
*
ptr
;
if
(
!
(
q
=
strstr
(
p
,
"
\n
"
)))
{
if
(
!*
p
)
return
NULL
;
*
ptr
+=
strlen
(
p
);
return
p
;
}
*
q
=
'\0'
;
*
ptr
=
q
+
1
;
return
p
;
}
/** Prints the GLSL info log which will contain error messages if they exist */
/* GL locking is done by the caller */
...
...
@@ -157,6 +175,8 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj)
* that if there are errors. */
if
(
infologLength
>
1
)
{
char
*
ptr
,
*
line
;
/* Fglrx doesn't terminate the string properly, but it tells us the proper length.
* So use HEAP_ZERO_MEMORY to avoid uninitialized bytes
*/
...
...
@@ -170,10 +190,17 @@ static void print_glsl_info_log(const WineD3D_GL_Info *gl_info, GLhandleARB obj)
break
;
}
}
if
(
is_spam
)
{
TRACE
(
"Spam received from GLSL shader #%u: %s
\n
"
,
obj
,
debugstr_a
(
infoLog
));
}
else
{
FIXME
(
"Error received from GLSL shader #%u: %s
\n
"
,
obj
,
debugstr_a
(
infoLog
));
ptr
=
infoLog
;
if
(
is_spam
)
{
TRACE
(
"Spam received from GLSL shader #%u:
\n
"
,
obj
);
while
((
line
=
get_info_log_line
(
&
ptr
)))
TRACE
(
" %s
\n
"
,
line
);
}
else
{
FIXME
(
"Error received from GLSL shader #%u:
\n
"
,
obj
);
while
((
line
=
get_info_log_line
(
&
ptr
)))
FIXME
(
" %s
\n
"
,
line
);
}
HeapFree
(
GetProcessHeap
(),
0
,
infoLog
);
}
...
...
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