ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Add function to print the infolog of a GLSL shader on errors. 

With assistance from H. Verbeet.
This commit is contained in:
Jason Green 2006-05-23 18:22:13 -04:00 committed by Alexandre Julliard
parent 8cfb84362f
commit a67488a26e
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/wined3d/baseshader.c
View File

@ -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) {

4
dlls/wined3d/wined3d_private.h
View File

@ -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));