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

[drape] const for parameter

Browse source
This commit is contained in:
ExMix 2013-12-26 18:59:46 +03:00 • committed by Alex Zolotarev
parent b940485801
commit 6f6b06f392
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/drape_tests/glfunctions.cpp
View file

@ -168,7 +168,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3,
MOCK_CALL(glUniformValuef(location, v1, v2, v3, v4));
}
void GLFunctions::glUniformMatrix4x4Value(int8_t location, float * values)
void GLFunctions::glUniformMatrix4x4Value(int8_t location, const float * values)
{
MOCK_CALL(glUniformMatrix4x4Value(location, values));
}

2
drape/drape_tests/glmock_functions.hpp
View file

@ -37,7 +37,7 @@ namespace emul
MOCK_METHOD3(glUniformValuef, void(int8_t location, float v1, float v2));
MOCK_METHOD4(glUniformValuef, void(int8_t location, float v1, float v2, float v3));
MOCK_METHOD5(glUniformValuef, void(int8_t location, float v1, float v2, float v3, float v4));
MOCK_METHOD2(glUniformMatrix4x4Value, void(int8_t location, float * values));
MOCK_METHOD2(glUniformMatrix4x4Value, void(int8_t location, const float * values));
MOCK_METHOD0(glGetCurrentProgram, uint32_t());
MOCK_METHOD1(glCreateShader, uint32_t(glConst type));

6
drape/drape_tests/uniform_value_tests.cpp
View file

@ -22,14 +22,14 @@ namespace
class MemoryComparer
{
public:
MemoryComparer(T * memory, uint32_t size)
MemoryComparer(const T * memory, uint32_t size)
: m_result(false)
, m_memory(memory)
, m_size(size)
{
}
void Compare(int32_t id, T * memory)
void Compare(int32_t id, const T * memory)
{
m_result = memcmp(m_memory, memory, m_size) == 0;
}
@ -41,7 +41,7 @@ namespace
private:
bool m_result;
T * m_memory;
const T * m_memory;
uint32_t m_size;
};
}

2
drape/glfunctions.cpp
View file

@ -395,7 +395,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3,
GLCHECK(glUniform4fFn(location, v1, v2, v3, v4));
}
void GLFunctions::glUniformMatrix4x4Value(int8_t location, float * values)
void GLFunctions::glUniformMatrix4x4Value(int8_t location, const float * values)
{
ASSERT(glUniformMatrix4fvFn != NULL, ());
ASSERT(location != -1, ());

2
drape/glfunctions.hpp
View file

@ -68,7 +68,7 @@ public:
static void glUniformValuef(int8_t location, float v1, float v2, float v3);
static void glUniformValuef(int8_t location, float v1, float v2, float v3, float v4);
static void glUniformMatrix4x4Value(int8_t location, float * values);
static void glUniformMatrix4x4Value(int8_t location, const float *values);
static uint32_t glGetCurrentProgram();