Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 18:33:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't try to set invalid uniforms

Browse source
This commit is contained in:
Brad Davis 2018-01-15 13:43:19 -08:00
parent d10d7026c5
commit 17e9c3d00c
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render-utils/src/text/Font.cpp
View file

@ -369,11 +369,15 @@ void Font::drawString(gpu::Batch& batch, float x, float y, const QString& str, c
batch.setPipeline(((*color).a < 1.0f || layered) ? _transparentPipeline : _pipeline); batch.setPipeline(((*color).a < 1.0f || layered) ? _transparentPipeline : _pipeline);
batch.setResourceTexture(_fontLoc, _texture); batch.setResourceTexture(_fontLoc, _texture);
batch._glUniform1i(_outlineLoc, (effectType == OUTLINE_EFFECT)); if (_outlineLoc >= 0) {
batch._glUniform1i(_outlineLoc, (effectType == OUTLINE_EFFECT));
}
// need the gamma corrected color here // need the gamma corrected color here
glm::vec4 lrgba = ColorUtils::sRGBToLinearVec4(*color); glm::vec4 lrgba = ColorUtils::sRGBToLinearVec4(*color);
batch._glUniform4fv(_colorLoc, 1, (const float*)&lrgba); if (_colorLoc >= 0) {
batch._glUniform4fv(_colorLoc, 1, (const float*)&lrgba);
}
batch.setInputFormat(_format); batch.setInputFormat(_format);
batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride); batch.setInputBuffer(0, _verticesBuffer, 0, _format->getChannels().at(0)._stride);