shader-pipeline: Error compiling on OS X

[afuzzyllama]

Operating System: OS X 10.9
IDE: Xcode 5.0.1

When compiling the static library, in COpenGLSLMaterialRenderer.cpp @ line 107:

Code: Select all

 
    if (Driver->getActiveGLSLProgram() == Program)
 

On OS X GLhandleARB is defined as a void* and cannot be cast correctly for this comparison. After looking at the code, is the following code necessary in the destructor?

Code: Select all

 
if (Program2)
{
    if (Driver->getActiveGLSLProgram() == Program2)
        Driver->setActiveGLSLProgram(0);
}
else if (Program)
{
    if (Driver->getActiveGLSLProgram() == Program)
        Driver->setActiveGLSLProgram(0);
}   
 

setActiveGLSLProgram(0) just "nulls" out ActiveGLSLProgram. Looking over the code briefly, it does not seem like this is something you need to do when the object is being destroyed anyway?

[Nadro]

Thanks for a report. I'll check it.