|
@@ -713,7 +713,8 @@ void GFXGLShader::initConstantDescs()
|
|
|
|
|
|
// fill out ubo desc.
|
|
|
desc.name = String((char*)uboName);
|
|
|
- desc.bindPoint = uboBinding;
|
|
|
+ desc.bindPoint = uboBinding == 0 ? glGetUniformBlockIndex(mProgram, uboName) : uboBinding;
|
|
|
+ glUniformBlockBinding(mProgram, glGetUniformBlockIndex(mProgram, uboName), desc.bindPoint);
|
|
|
desc.size = uboSize;
|
|
|
desc.constType = GFXSCT_ConstBuffer;
|
|
|
desc.samplerReg = -1;
|
|
@@ -888,7 +889,7 @@ void GFXGLShader::initHandles()
|
|
|
// Index element 1 of the name to skip the '$' we inserted earier.
|
|
|
GLint loc = glGetUniformLocation(mProgram, &desc.name.c_str()[1]);
|
|
|
|
|
|
- AssertFatal(loc != -1, avar("uniform %s in shader file Vert: (%s) Frag: (%s)", &desc.name.c_str()[1], mVertexFile.getFullPath().c_str(), mPixelFile.getFullPath().c_str()));
|
|
|
+ //AssertFatal(loc != -1, avar("uniform %s in shader file Vert: (%s) Frag: (%s)", &desc.name.c_str()[1], mVertexFile.getFullPath().c_str(), mPixelFile.getFullPath().c_str()));
|
|
|
|
|
|
HandleMap::Iterator handle = mHandles.find(desc.name);
|
|
|
S32 sampler = -1;
|