FIxing the compilation issue for linux

This commit is contained in:
Sam Gateau 2015-03-03 11:01:47 -08:00
parent 4619ba1f5b
commit 598b791aee

View file

@ -223,17 +223,21 @@ void Model::initProgram(ProgramObject& program, Model::Locations& locations, boo
} }
#endif #endif
#if defined(Q_OS_WIN)
loc = glGetUniformBlockIndex(program.programId(), "transformObjectBuffer"); loc = glGetUniformBlockIndex(program.programId(), "transformObjectBuffer");
if (loc >= 0) { if (loc >= 0) {
glUniformBlockBinding(program.programId(), loc, gpu::TRANSFORM_OBJECT_SLOT); glUniformBlockBinding(program.programId(), loc, gpu::TRANSFORM_OBJECT_SLOT);
// locations.materialBufferUnit = 1; // locations.materialBufferUnit = 1;
} }
#endif
#if defined(Q_OS_WIN)
loc = glGetUniformBlockIndex(program.programId(), "transformCameraBuffer"); loc = glGetUniformBlockIndex(program.programId(), "transformCameraBuffer");
if (loc >= 0) { if (loc >= 0) {
glUniformBlockBinding(program.programId(), loc, gpu::TRANSFORM_CAMERA_SLOT); glUniformBlockBinding(program.programId(), loc, gpu::TRANSFORM_CAMERA_SLOT);
// locations.materialBufferUnit = 1; // locations.materialBufferUnit = 1;
} }
#endif
//program.link(); //program.link();
if (!program.isLinked()) { if (!program.isLinked()) {