gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[linux] Compilation fixes

Browse source
This commit is contained in:
OSM user on RU2 2015-01-16 15:31:55 +03:00 • committed by Alex Zolotarev
parent c31ad98de7
commit 378cca6132
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/drape_tests/glfunctions.cpp
View file

@ -257,3 +257,5 @@ void * GLFunctions::glMapBuffer(glConst target) { return 0; }
void GLFunctions::glUnmapBuffer(glConst target) {}
void GLFunctions::glDrawElements(uint16_t indexCount) {}
void GLFunctions::glPixelStore(glConst name, uint32_t value) {}

8
drape/glsl_types.hpp
View file

@ -55,26 +55,26 @@ inline vec2 ToVec2(m2::PointD const & pt)
}
template <typename T>
uint8_t GetComponentCount()
inline uint8_t GetComponentCount()
{
ASSERT(false, ());
return 0;
}
template <>
uint8_t GetComponentCount<vec2>()
inline uint8_t GetComponentCount<vec2>()
{
return 2;
}
template <>
uint8_t GetComponentCount<vec3>()
inline uint8_t GetComponentCount<vec3>()
{
return 3;
}
template <>
uint8_t GetComponentCount<vec4>()
inline uint8_t GetComponentCount<vec4>()
{
return 4;
}