Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / angle / tests / perf_tests / BufferSubData.cpp

diff --git a/src/third_party/angle/tests/perf_tests/BufferSubData.cpp b/src/third_party/angle/tests/perf_tests/BufferSubData.cpp
index 01c9a67..fbc4cea 100644 (file)
--- a/src/third_party/angle/tests/perf_tests/BufferSubData.cpp
+++ b/src/third_party/angle/tests/perf_tests/BufferSubData.cpp
@@ -126,40 +126,35 @@ GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized
 
 }
 
-std::string BufferSubDataParams::name() const
+std::string BufferSubDataParams::suffix() const
 {
     std::stringstream strstr;
 
-    strstr << "BufferSubData - " << BenchmarkParams::name() << " - ";
-
     if (vertexNormalized)
     {
-        strstr << "Norm";
+        strstr << "_norm";
     }
 
     switch (vertexType)
     {
-      case GL_FLOAT: strstr << "Float"; break;
-      case GL_INT: strstr << "Int"; break;
-      case GL_BYTE: strstr << "Byte"; break;
-      case GL_SHORT: strstr << "Short"; break;
-      case GL_UNSIGNED_INT: strstr << "UInt"; break;
-      case GL_UNSIGNED_BYTE: strstr << "UByte"; break;
-      case GL_UNSIGNED_SHORT: strstr << "UShort"; break;
-      default: strstr << "UNKNOWN FORMAT (" << vertexType << ")"; break;
+      case GL_FLOAT: strstr << "_float"; break;
+      case GL_INT: strstr << "_int"; break;
+      case GL_BYTE: strstr << "_byte"; break;
+      case GL_SHORT: strstr << "_short"; break;
+      case GL_UNSIGNED_INT: strstr << "_uint"; break;
+      case GL_UNSIGNED_BYTE: strstr << "_ubyte"; break;
+      case GL_UNSIGNED_SHORT: strstr << "_ushort"; break;
+      default: strstr << "_vunk_" << vertexType << "_"; break;
     }
 
     strstr << vertexComponentCount;
-
-    strstr << " - " << updateSize << "b updates (per " << updatesEveryNFrames << ") - ";
-    strstr << (bufferSize >> 10) << "k buffer - ";
-    strstr << iterations << " updates";
+    strstr << "_every" << updatesEveryNFrames;
 
     return strstr.str();
 }
 
 BufferSubDataBenchmark::BufferSubDataBenchmark(const BufferSubDataParams &params)
-    : SimpleBenchmark(params.name(), 1280, 720, 2, params.requestedRenderer),
+    : SimpleBenchmark("BufferSubData", 1280, 720, 2, params),
       mProgram(0),
       mBuffer(0),
       mUpdateData(NULL),
@@ -207,11 +202,11 @@ bool BufferSubDataBenchmark::initializeBenchmark()
 
 
     std::vector<uint8_t> zeroData(mParams.bufferSize);
-    memset(zeroData.data(), 0, zeroData.size());
+    memset(&zeroData[0], 0, zeroData.size());
 
     glGenBuffers(1, &mBuffer);
     glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
-    glBufferData(GL_ARRAY_BUFFER, mParams.bufferSize, zeroData.data(), GL_DYNAMIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, mParams.bufferSize, &zeroData[0], GL_DYNAMIC_DRAW);
 
     glVertexAttribPointer(0, mParams.vertexComponentCount, mParams.vertexType,
                           mParams.vertexNormalized, 0, 0);
@@ -230,14 +225,14 @@ bool BufferSubDataBenchmark::initializeBenchmark()
     mNumTris = mParams.updateSize / triDataSize;
     for (int i = 0, offset = 0; i < mNumTris; ++i)
     {
-        memcpy(mUpdateData + offset, data.data(), triDataSize);
+        memcpy(mUpdateData + offset, &data[0], triDataSize);
         offset += triDataSize;
     }
 
     if (mParams.updateSize == 0)
     {
         mNumTris = 1;
-        glBufferSubData(GL_ARRAY_BUFFER, 0, data.size(), data.data());
+        glBufferSubData(GL_ARRAY_BUFFER, 0, data.size(), &data[0]);
     }
 
     // Set the viewport
@@ -266,6 +261,11 @@ bool BufferSubDataBenchmark::initializeBenchmark()
 
 void BufferSubDataBenchmark::destroyBenchmark()
 {
+    // print static parameters
+    printResult("update_size", static_cast<size_t>(mParams.updateSize), "b", false);
+    printResult("buffer_size", static_cast<size_t>(mParams.bufferSize), "b", false);
+    printResult("iterations", static_cast<size_t>(mParams.iterations), "updates", false);
+
     glDeleteProgram(mProgram);
     glDeleteBuffers(1, &mBuffer);
     delete[] mUpdateData;