fix warning for std::copy

TRAC #11558 * VertexDataManager::internalPreRenderValidate operates directly on the output pointer. Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Andrew Lewycky git-svn-id: https://angleproject.googlecode.com/svn/trunk@74 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent b994e3bd
...@@ -103,7 +103,7 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib ...@@ -103,7 +103,7 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib
Index minIndex, Index minIndex,
Index maxIndex, Index maxIndex,
TranslationHelper *translator, TranslationHelper *translator,
TranslatedAttribute *outAttribs) TranslatedAttribute *translated)
{ {
std::bitset<MAX_VERTEX_ATTRIBS> translateOrLift; std::bitset<MAX_VERTEX_ATTRIBS> translateOrLift;
...@@ -113,8 +113,6 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib ...@@ -113,8 +113,6 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib
return GL_INVALID_OPERATION; return GL_INVALID_OPERATION;
} }
TranslatedAttribute translated[MAX_VERTEX_ATTRIBS];
for (int i = 0; i < MAX_VERTEX_ATTRIBS; i++) for (int i = 0; i < MAX_VERTEX_ATTRIBS; i++)
{ {
translated[i].enabled = activeAttribs[i]; translated[i].enabled = activeAttribs[i];
...@@ -207,8 +205,6 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib ...@@ -207,8 +205,6 @@ GLenum VertexDataManager::internalPreRenderValidate(const AttributeState *attrib
} }
} }
std::copy(translated, translated + MAX_VERTEX_ATTRIBS, outAttribs);
return GL_NO_ERROR; return GL_NO_ERROR;
} }
......
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