Rename UniformTypeSize to UniformInternalSize

Trac #18608 Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@868 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent edc31508
...@@ -36,7 +36,7 @@ std::string str(int i) ...@@ -36,7 +36,7 @@ std::string str(int i)
Uniform::Uniform(GLenum type, const std::string &_name, unsigned int arraySize) Uniform::Uniform(GLenum type, const std::string &_name, unsigned int arraySize)
: type(type), _name(_name), name(Program::undecorateUniform(_name)), arraySize(arraySize) : type(type), _name(_name), name(Program::undecorateUniform(_name)), arraySize(arraySize)
{ {
int bytes = UniformTypeSize(type) * arraySize; int bytes = UniformInternalSize(type) * arraySize;
data = new unsigned char[bytes]; data = new unsigned char[bytes];
memset(data, 0, bytes); memset(data, 0, bytes);
dirty = true; dirty = true;
......
...@@ -135,7 +135,7 @@ size_t UniformComponentSize(GLenum type) ...@@ -135,7 +135,7 @@ size_t UniformComponentSize(GLenum type)
return 0; return 0;
} }
size_t UniformTypeSize(GLenum type) size_t UniformInternalSize(GLenum type)
{ {
return UniformComponentSize(UniformComponentType(type)) * UniformInternalComponentCount(type); return UniformComponentSize(UniformComponentType(type)) * UniformInternalComponentCount(type);
} }
......
...@@ -24,7 +24,7 @@ struct Color; ...@@ -24,7 +24,7 @@ struct Color;
int UniformExternalComponentCount(GLenum type); int UniformExternalComponentCount(GLenum type);
int UniformInternalComponentCount(GLenum type); int UniformInternalComponentCount(GLenum type);
GLenum UniformComponentType(GLenum type); GLenum UniformComponentType(GLenum type);
size_t UniformTypeSize(GLenum type); size_t UniformInternalSize(GLenum type);
int VariableRowCount(GLenum type); int VariableRowCount(GLenum type);
int VariableColumnCount(GLenum type); int VariableColumnCount(GLenum type);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment