Don't use strlen inside of loop

This could hurt performance quite a bit. BUG=296 TEST= Review URL: https://codereview.appspot.com/5675086 git-svn-id: https://angleproject.googlecode.com/svn/trunk@993 736b8ea6-26fd-11df-bfd4-992fa37f6226

Don't use strlen inside of loop
51b2685b · jbauman@chromium.org · 0725e7df · 51b2685b · 51b2685b · 51b2685b
Commit 51b2685b authored Feb 21, 2012 by jbauman@chromium.org
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 16 deletions

version.h src/common/version.h +1 -1

Program.cpp src/libGLESv2/Program.cpp +2 -5

Shader.cpp src/libGLESv2/Shader.cpp +4 -10

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 992
+#define BUILD_REVISION 993
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -2456,11 +2456,8 @@ void Program::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
    if (mInfoLog)
    {
-        while (index < bufSize - 1 && index < (int)strlen(mInfoLog))
+        index = std::min(bufSize - 1, (int)strlen(mInfoLog));
-        {
+        memcpy(infoLog, mInfoLog, index);
-            infoLog[index] = mInfoLog[index];
-            index++;
-        }
    }
    if (bufSize)

--- a/src/libGLESv2/Shader.cpp
+++ b/src/libGLESv2/Shader.cpp
@@ -104,11 +104,8 @@ void Shader::getInfoLog(GLsizei bufSize, GLsizei *length, char *infoLog)
    if (mInfoLog)
    {
-        while (index < bufSize - 1 && index < (int)strlen(mInfoLog))
+        index = std::min(bufSize - 1, (int)strlen(mInfoLog));
-        {
+        memcpy(infoLog, mInfoLog, index);
-            infoLog[index] = mInfoLog[index];
-            index++;
-        }
    }
    if (bufSize)
@@ -152,11 +149,8 @@ void Shader::getSourceImpl(char *source, GLsizei bufSize, GLsizei *length, char 
    if (source)
    {
-        while (index < bufSize - 1 && index < (int)strlen(source))
+        index = std::min(bufSize - 1, (int)strlen(source));
-        {
+        memcpy(buffer, source, index);
-            buffer[index] = source[index];
-            index++;
-        }
    }
    if (bufSize)