TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update gfxGLShader.cpp

Browse source 
restore assertfatal if the bindPoint ==-1 as these require a location, ubo uniforms location returns -1
This commit is contained in:
marauder2k7 2025-05-21 07:16:45 +01:00
parent ab36fe24ec
commit f40c20d2f4
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/gfx/gl/gfxGLShader.cpp
View file

@ -889,7 +889,8 @@ void GFXGLShader::initHandles()
// Index element 1 of the name to skip the '$' we inserted earier. // Index element 1 of the name to skip the '$' we inserted earier.
GLint loc = glGetUniformLocation(mProgram, &desc.name.c_str()[1]); 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())); // The location for uniforms inside a UBO come back as -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()));
HandleMap::Iterator handle = mHandles.find(desc.name); HandleMap::Iterator handle = mHandles.find(desc.name);
S32 sampler = -1; S32 sampler = -1;
@ -908,6 +909,7 @@ void GFXGLShader::initHandles()
{ {
if (desc.bindPoint == -1) if (desc.bindPoint == -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()));
desc.bindPoint = loc; desc.bindPoint = loc;
mHandles[desc.name]->mUBOUniform = false; mHandles[desc.name]->mUBOUniform = false;
} }
@ -922,6 +924,7 @@ void GFXGLShader::initHandles()
{ {
if (desc.bindPoint == -1) if (desc.bindPoint == -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()));
desc.bindPoint = loc; desc.bindPoint = loc;
mHandles[desc.name] = new GFXGLShaderConstHandle(this, desc); mHandles[desc.name] = new GFXGLShaderConstHandle(this, desc);
mHandles[desc.name]->mUBOUniform = false; mHandles[desc.name]->mUBOUniform = false;