Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization

This commit is contained in:
ZappoMan 2013-05-08 15:07:24 -07:00
commit b35c88029e

View file

@ -18,7 +18,7 @@ ShaderObject::~ShaderObject() {
}
bool ShaderObject::compileSourceCode(const char* data) {
glShaderSource(_handle, 1, &data, 0);
glShaderSourceARB(_handle, 1, &data, 0);
glCompileShaderARB(_handle);
int status;
glGetObjectParameterivARB(_handle, GL_OBJECT_COMPILE_STATUS_ARB, &status);