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
a67488a2
Commit
a67488a2
authored
May 23, 2006
by
Jason Green
Committed by
Alexandre Julliard
May 24, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add function to print the infolog of a GLSL shader on errors.
With assistance from H. Verbeet.
parent
8cfb8436
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
0 deletions
+25
-0
baseshader.c
dlls/wined3d/baseshader.c
+21
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+4
-0
No files found.
dlls/wined3d/baseshader.c
View file @
a67488a2
...
...
@@ -29,6 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d_shader
);
#define GLNAME_REQUIRE_GLSL ((const char *)1)
#define GLINFO_LOCATION (*gl_info)
typedef
struct
shader_reg_maps
{
DWORD
texcoord
;
...
...
@@ -675,6 +676,26 @@ void generate_base_shader(
}
}
/** Prints the GLSL info log which will contain error messages if they exist */
void
print_glsl_info_log
(
WineD3D_GL_Info
*
gl_info
,
GLhandleARB
obj
)
{
int
infologLength
=
0
;
char
*
infoLog
;
GL_EXTCALL
(
glGetObjectParameterivARB
(
obj
,
GL_OBJECT_INFO_LOG_LENGTH_ARB
,
&
infologLength
));
if
(
infologLength
>
0
)
{
infoLog
=
(
char
*
)
HeapAlloc
(
GetProcessHeap
(),
0
,
infologLength
);
GL_EXTCALL
(
glGetInfoLogARB
(
obj
,
infologLength
,
NULL
,
infoLog
));
FIXME
(
"Error received from GLSL shader #%i: %s"
,
obj
,
debugstr_a
(
infoLog
));
HeapFree
(
GetProcessHeap
(),
0
,
infoLog
);
}
}
void
shader_dump_ins_modifiers
(
const
DWORD
output
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
a67488a2
...
...
@@ -1388,6 +1388,10 @@ extern int shader_skip_unrecognized(
IWineD3DBaseShader
*
iface
,
const
DWORD
*
pToken
);
extern
void
print_glsl_info_log
(
WineD3D_GL_Info
*
gl_info
,
GLhandleARB
obj
);
inline
static
int
shader_get_regtype
(
const
DWORD
param
)
{
return
(((
param
&
D3DSP_REGTYPE_MASK
)
>>
D3DSP_REGTYPE_SHIFT
)
|
((
param
&
D3DSP_REGTYPE_MASK2
)
>>
D3DSP_REGTYPE_SHIFT2
));
...
...
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