Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

osx fix: TIMER_ADD_CLIENT identifier conflicted with the name of an existing symbol (namely the OpenGL function whose time was being measured)

Browse Source 
This was SVN commit r7374.
This commit is contained in:
janwas 2010-03-20 17:46:45 +00:00
parent 73f67a2272
commit bdfe28766a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/lib/res/graphics/ogl_shader.cpp
View File

@ -102,8 +102,8 @@ static void Ogl_Shader_init(Ogl_Shader* shdr, va_list args)
shdr->type = va_arg(args, GLenum); shdr->type = va_arg(args, GLenum);
} }
TIMER_ADD_CLIENT(glCompileShader); TIMER_ADD_CLIENT(tc_compileShader);
TIMER_ADD_CLIENT(glLinkProgram); TIMER_ADD_CLIENT(tc_linkProgram);
// Reload the shader object from the source file. // Reload the shader object from the source file.
// //
@ -147,7 +147,7 @@ static LibError Ogl_Shader_reload(Ogl_Shader* shdr, const VfsPath& pathname, Han
ogl_WarnIfError(); ogl_WarnIfError();
{ {
TIMER_ACCRUE(glCompileShader); TIMER_ACCRUE(tc_compileShader);
pglCompileShaderARB(shdr->id); pglCompileShaderARB(shdr->id);
} }
@ -390,7 +390,7 @@ static LibError Ogl_Program_reload(Ogl_Program* p, const VfsPath& pathname, Hand
} }
{ {
TIMER_ACCRUE(glLinkProgram); TIMER_ACCRUE(tc_linkProgram);
pglLinkProgramARB(p->id); pglLinkProgramARB(p->id);
} }