kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[drape] Uniform values improvements.

Browse source
This commit is contained in:
Dmitry Kunin 2014-01-09 16:08:31 +03:00 • committed by Alex Zolotarev
parent 77442bfd8c
commit b8a0e45116
1 changed files with 16 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drape/uniform_value.cpp
View file

@ -227,7 +227,8 @@ void UniformValue::SetMatrix4x4Value(const float * matrixValue)
void UniformValue::Apply(RefPointer<GpuProgram> program) const
{
ASSERT(program->HasUniform(m_name, GetCorrespondingGLType(), 1), ());
ASSERT(program->HasUniform(m_name, GetCorrespondingGLType(), 1),
("Failed to find uniform", m_name, GetCorrespondingGLType(), 1));
uint8_t location = program->GetUniformLocation(m_name);
switch (m_type) {
@ -249,35 +250,23 @@ glConst UniformValue::GetCorrespondingGLType() const
{
if (Int == m_type)
{
if (1 == m_componentCount)
return GLConst::GLIntType;
else if (2 == m_componentCount)
return GLConst::GLIntVec2;
else if (3 == m_componentCount)
return GLConst::GLIntVec3;
else if (4 == m_componentCount)
return GLConst::GLIntVec4;
else
{
ASSERT(false, ());
return -1;
}
static glConst intTypes[4] = {
GLConst::GLIntType,
GLConst::GLIntVec2,
GLConst::GLIntVec3,
GLConst::GLIntVec4
};
return intTypes[m_componentCount - 1];
}
else if (Float == m_type)
{
if (1 == m_componentCount)
return GLConst::GLFloatType;
else if (2 == m_componentCount)
return GLConst::GLFloatVec2;
else if (3 == m_componentCount)
return GLConst::GLFloatVec3;
else if (4 == m_componentCount)
return GLConst::GLFloatVec4;
else
{
ASSERT(false, ());
return -1;
}
static glConst floatTypes[4] = {
GLConst::GLFloatType,
GLConst::GLFloatVec2,
GLConst::GLFloatVec3,
GLConst::GLFloatVec4
};
return floatTypes[m_componentCount - 1];
}
else if (Matrix4x4 == m_type)
{