Fix for travis-ci
This commit is contained in:
parent
072c118f95
commit
fb9dc7af74
@ -598,6 +598,11 @@ void glUniform1fWrapper(GLuint a, float b)
|
||||
glUniform1f(a, b);
|
||||
}
|
||||
|
||||
bool needsUBO()
|
||||
{
|
||||
return irr_driver->needUBOWorkaround();
|
||||
}
|
||||
|
||||
namespace MeshShader
|
||||
{
|
||||
// Solid Normal and depth pass shaders
|
||||
|
@ -53,6 +53,7 @@ void glUniformMatrix4fvWraper(GLuint, size_t, unsigned, const float *mat);
|
||||
void glUniform3fWraper(GLuint, float, float, float);
|
||||
void glUniform2fWraper(GLuint a, float b, float c);
|
||||
void glUniform1fWrapper(GLuint, float);
|
||||
bool needsUBO();
|
||||
|
||||
struct UniformHelper
|
||||
{
|
||||
@ -128,7 +129,7 @@ public:
|
||||
|
||||
void setUniforms(const Args & ... args) const
|
||||
{
|
||||
if (irr_driver->needUBOWorkaround())
|
||||
if (needsUBO())
|
||||
bypassUBO(Program);
|
||||
UniformHelper::setUniformsHelper(uniforms, args...);
|
||||
}
|
||||
@ -158,7 +159,7 @@ public:
|
||||
|
||||
void setUniforms(const Args & ... args) const
|
||||
{
|
||||
if (irr_driver->needUBOWorkaround())
|
||||
if (needsUBO())
|
||||
bypassUBO(Program);
|
||||
UniformHelper::setUniformsHelper(uniforms, args...);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user