Skip to content

A
angle
Commit fecbed9f by Olli Etuaho
Options

Fix code style in perf tests

1) Format switch/case with git cl format 2) Change NULL -> nullptr 3) Change int to GLint where appropriate 4) Use more appropriate variants of asserts BUG=angleproject:1261 TEST=angle_perftests Change-Id: I97d6260dbd72ef3897fff145682b7043bf323b76 Reviewed-on: https://chromium-review.googlesource.com/319380 Tryjob-Request: Olli Etuaho <oetuaho@nvidia.com> Tested-by: 's avatarOlli Etuaho <oetuaho@nvidia.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent a8893120
Showing with 112 additions and 59 deletions
src/tests/perf_tests/ANGLEPerfTest.cpp
...@@ -77,12 +77,19 @@ std::string RenderTestParams::suffix() const ...@@ -77,12 +77,19 @@ std::string RenderTestParams::suffix() const
{ {
switch (getRenderer()) switch (getRenderer())
{ {
case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE: return "_d3d11"; case EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE:
case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE: return "_d3d9"; return "_d3d11";
case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE: return "_gl"; case EGL_PLATFORM_ANGLE_TYPE_D3D9_ANGLE:
case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE: return "_gles"; return "_d3d9";
case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE: return "_default"; case EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE:
default: assert(0); return "_unk"; return "_gl";
case EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE:
return "_gles";
case EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE:
return "_default";
default:
assert(0);
return "_unk";
} }
} }
......
src/tests/perf_tests/ANGLEPerfTest.h
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
class Event; class Event;
#ifndef ASSERT_GL_NO_ERROR #ifndef ASSERT_GL_NO_ERROR
#define ASSERT_GL_NO_ERROR() ASSERT_TRUE(glGetError() == GL_NO_ERROR) #define ASSERT_GL_NO_ERROR() ASSERT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError())
#endif #endif
class ANGLEPerfTest : public testing::Test, angle::NonCopyable class ANGLEPerfTest : public testing::Test, angle::NonCopyable
......
src/tests/perf_tests/BufferSubData.cpp
...@@ -94,10 +94,14 @@ GLfloat *GetFloatData(GLint componentCount) ...@@ -94,10 +94,14 @@ GLfloat *GetFloatData(GLint componentCount)
switch (componentCount) switch (componentCount)
{ {
case 2: return vertices2; case 2:
case 3: return vertices3; return vertices2;
case 4: return vertices4; case 3:
default: return NULL; return vertices3;
case 4:
return vertices4;
default:
return nullptr;
} }
} }
...@@ -151,13 +155,26 @@ GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized ...@@ -151,13 +155,26 @@ GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized
switch (type) switch (type)
{ {
case GL_BYTE: triDataSize = GetNormalizedData<GLbyte>(numElements, floatData, data); break; case GL_BYTE:
case GL_SHORT: triDataSize = GetNormalizedData<GLshort>(numElements, floatData, data); break; triDataSize = GetNormalizedData<GLbyte>(numElements, floatData, data);
case GL_INT: triDataSize = GetNormalizedData<GLint>(numElements, floatData, data); break; break;
case GL_UNSIGNED_BYTE: triDataSize = GetNormalizedData<GLubyte>(numElements, floatData, data); break; case GL_SHORT:
case GL_UNSIGNED_SHORT: triDataSize = GetNormalizedData<GLushort>(numElements, floatData, data); break; triDataSize = GetNormalizedData<GLshort>(numElements, floatData, data);
case GL_UNSIGNED_INT: triDataSize = GetNormalizedData<GLuint>(numElements, floatData, data); break; break;
default: assert(0); case GL_INT:
triDataSize = GetNormalizedData<GLint>(numElements, floatData, data);
break;
case GL_UNSIGNED_BYTE:
triDataSize = GetNormalizedData<GLubyte>(numElements, floatData, data);
break;
case GL_UNSIGNED_SHORT:
triDataSize = GetNormalizedData<GLushort>(numElements, floatData, data);
break;
case GL_UNSIGNED_INT:
triDataSize = GetNormalizedData<GLuint>(numElements, floatData, data);
break;
default:
assert(0);
} }
} }
else else
...@@ -166,13 +183,26 @@ GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized ...@@ -166,13 +183,26 @@ GLsizeiptr GetVertexData(GLenum type, GLint componentCount, GLboolean normalized
switch (type) switch (type)
{ {
case GL_BYTE: triDataSize = GetIntData<GLbyte>(numElements, floatData, data); break; case GL_BYTE:
case GL_SHORT: triDataSize = GetIntData<GLshort>(numElements, floatData, data); break; triDataSize = GetIntData<GLbyte>(numElements, floatData, data);
case GL_INT: triDataSize = GetIntData<GLint>(numElements, floatData, data); break; break;
case GL_UNSIGNED_BYTE: triDataSize = GetIntData<GLubyte>(numElements, floatData, data); break; case GL_SHORT:
case GL_UNSIGNED_SHORT: triDataSize = GetIntData<GLushort>(numElements, floatData, data); break; triDataSize = GetIntData<GLshort>(numElements, floatData, data);
case GL_UNSIGNED_INT: triDataSize = GetIntData<GLuint>(numElements, floatData, data); break; break;
default: assert(0); case GL_INT:
triDataSize = GetIntData<GLint>(numElements, floatData, data);
break;
case GL_UNSIGNED_BYTE:
triDataSize = GetIntData<GLubyte>(numElements, floatData, data);
break;
case GL_UNSIGNED_SHORT:
triDataSize = GetIntData<GLushort>(numElements, floatData, data);
break;
case GL_UNSIGNED_INT:
triDataSize = GetIntData<GLuint>(numElements, floatData, data);
break;
default:
assert(0);
} }
} }
...@@ -192,14 +222,30 @@ std::string BufferSubDataParams::suffix() const ...@@ -192,14 +222,30 @@ std::string BufferSubDataParams::suffix() const
switch (vertexType) switch (vertexType)
{ {
case GL_FLOAT: strstr << "_float"; break; case GL_FLOAT:
case GL_INT: strstr << "_int"; break; strstr << "_float";
case GL_BYTE: strstr << "_byte"; break; break;
case GL_SHORT: strstr << "_short"; break; case GL_INT:
case GL_UNSIGNED_INT: strstr << "_uint"; break; strstr << "_int";
case GL_UNSIGNED_BYTE: strstr << "_ubyte"; break; break;
case GL_UNSIGNED_SHORT: strstr << "_ushort"; break; case GL_BYTE:
default: strstr << "_vunk_" << vertexType << "_"; break; 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 << vertexComponentCount;
...@@ -212,7 +258,7 @@ BufferSubDataBenchmark::BufferSubDataBenchmark() ...@@ -212,7 +258,7 @@ BufferSubDataBenchmark::BufferSubDataBenchmark()
: ANGLERenderTest("BufferSubData", GetParam()), : ANGLERenderTest("BufferSubData", GetParam()),
mProgram(0), mProgram(0),
mBuffer(0), mBuffer(0),
mUpdateData(NULL), mUpdateData(nullptr),
mNumTris(0) mNumTris(0)
{ {
} }
...@@ -221,8 +267,8 @@ void BufferSubDataBenchmark::initializeBenchmark() ...@@ -221,8 +267,8 @@ void BufferSubDataBenchmark::initializeBenchmark()
{ {
const auto &params = GetParam(); const auto &params = GetParam();
ASSERT_TRUE(params.vertexComponentCount > 1); ASSERT_LT(1, params.vertexComponentCount);
ASSERT_TRUE(params.iterations > 0); ASSERT_LT(0u, params.iterations);
mDrawIterations = params.iterations; mDrawIterations = params.iterations;
const std::string vs = SHADER_SOURCE const std::string vs = SHADER_SOURCE
...@@ -246,7 +292,7 @@ void BufferSubDataBenchmark::initializeBenchmark() ...@@ -246,7 +292,7 @@ void BufferSubDataBenchmark::initializeBenchmark()
); );
mProgram = CompileProgram(vs, fs); mProgram = CompileProgram(vs, fs);
ASSERT_TRUE(mProgram != 0); ASSERT_NE(0u, mProgram);
// Use the program object // Use the program object
glUseProgram(mProgram); glUseProgram(mProgram);
......
src/tests/perf_tests/DrawCallPerf.cpp
...@@ -91,7 +91,7 @@ void DrawCallPerfBenchmark::initializeBenchmark() ...@@ -91,7 +91,7 @@ void DrawCallPerfBenchmark::initializeBenchmark()
{ {
const auto &params = GetParam(); const auto &params = GetParam();
ASSERT_TRUE(params.iterations > 0); ASSERT_LT(0u, params.iterations);
mDrawIterations = params.iterations; mDrawIterations = params.iterations;
const std::string vs = SHADER_SOURCE const std::string vs = SHADER_SOURCE
...@@ -115,7 +115,7 @@ void DrawCallPerfBenchmark::initializeBenchmark() ...@@ -115,7 +115,7 @@ void DrawCallPerfBenchmark::initializeBenchmark()
); );
mProgram = CompileProgram(vs, fs); mProgram = CompileProgram(vs, fs);
ASSERT_TRUE(mProgram != 0); ASSERT_NE(0u, mProgram);
// Use the program object // Use the program object
glUseProgram(mProgram); glUseProgram(mProgram);
......
src/tests/perf_tests/EGLInitializePerf.cpp
...@@ -134,11 +134,11 @@ EGLInitializePerfTest::~EGLInitializePerfTest() ...@@ -134,11 +134,11 @@ EGLInitializePerfTest::~EGLInitializePerfTest()
void EGLInitializePerfTest::step(float dt, double totalTime) void EGLInitializePerfTest::step(float dt, double totalTime)
{ {
ASSERT_TRUE(mDisplay != EGL_NO_DISPLAY); ASSERT_NE(EGL_NO_DISPLAY, mDisplay);
EGLint majorVersion, minorVersion; EGLint majorVersion, minorVersion;
ASSERT_TRUE(eglInitialize(mDisplay, &majorVersion, &minorVersion) == EGL_TRUE); ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE), eglInitialize(mDisplay, &majorVersion, &minorVersion));
ASSERT_TRUE(eglTerminate(mDisplay) == EGL_TRUE); ASSERT_EQ(static_cast<EGLBoolean>(EGL_TRUE), eglTerminate(mDisplay));
if (mTimer->getElapsedTime() >= 5.0) if (mTimer->getElapsedTime() >= 5.0)
{ {
......
src/tests/perf_tests/IndexConversionPerf.cpp
...@@ -75,8 +75,8 @@ void IndexConversionPerfTest::initializeBenchmark() ...@@ -75,8 +75,8 @@ void IndexConversionPerfTest::initializeBenchmark()
{ {
const auto &params = GetParam(); const auto &params = GetParam();
ASSERT_TRUE(params.iterations > 0); ASSERT_LT(0u, params.iterations);
ASSERT_TRUE(params.numIndexTris > 0); ASSERT_LT(0u, params.numIndexTris);
mDrawIterations = params.iterations; mDrawIterations = params.iterations;
...@@ -101,7 +101,7 @@ void IndexConversionPerfTest::initializeBenchmark() ...@@ -101,7 +101,7 @@ void IndexConversionPerfTest::initializeBenchmark()
); );
mProgram = CompileProgram(vs, fs); mProgram = CompileProgram(vs, fs);
ASSERT_TRUE(mProgram != 0); ASSERT_NE(0u, mProgram);
// Use the program object // Use the program object
glUseProgram(mProgram); glUseProgram(mProgram);
...@@ -150,7 +150,7 @@ void IndexConversionPerfTest::initializeBenchmark() ...@@ -150,7 +150,7 @@ void IndexConversionPerfTest::initializeBenchmark()
glUniform1f(glGetUniformLocation(mProgram, "uScale"), scale); glUniform1f(glGetUniformLocation(mProgram, "uScale"), scale);
glUniform1f(glGetUniformLocation(mProgram, "uOffset"), offset); glUniform1f(glGetUniformLocation(mProgram, "uOffset"), offset);
ASSERT_TRUE(glGetError() == GL_NO_ERROR); ASSERT_GL_NO_ERROR();
} }
void IndexConversionPerfTest::updateBufferData() void IndexConversionPerfTest::updateBufferData()
...@@ -186,7 +186,7 @@ void IndexConversionPerfTest::drawBenchmark() ...@@ -186,7 +186,7 @@ void IndexConversionPerfTest::drawBenchmark()
reinterpret_cast<GLvoid*>(0)); reinterpret_cast<GLvoid*>(0));
} }
EXPECT_TRUE(glGetError() == GL_NO_ERROR); ASSERT_GL_NO_ERROR();
} }
IndexConversionPerfParams IndexConversionPerfD3D11Params() IndexConversionPerfParams IndexConversionPerfD3D11Params()
......
src/tests/perf_tests/InstancingPerf.cpp
...@@ -105,7 +105,7 @@ void InstancingPerfBenchmark::initializeBenchmark() ...@@ -105,7 +105,7 @@ void InstancingPerfBenchmark::initializeBenchmark()
{ {
const auto &params = GetParam(); const auto &params = GetParam();
ASSERT_TRUE(params.iterations > 0); ASSERT_LT(0u, params.iterations);
mDrawIterations = params.iterations; mDrawIterations = params.iterations;
const std::string vs = const std::string vs =
...@@ -133,7 +133,7 @@ void InstancingPerfBenchmark::initializeBenchmark() ...@@ -133,7 +133,7 @@ void InstancingPerfBenchmark::initializeBenchmark()
"}\n"; "}\n";
mProgram = CompileProgram(vs, fs); mProgram = CompileProgram(vs, fs);
ASSERT_TRUE(mProgram != 0); ASSERT_NE(0u, mProgram);
glUseProgram(mProgram); glUseProgram(mProgram);
......
src/tests/perf_tests/InterleavedAttributeData.cpp
...@@ -95,7 +95,7 @@ void InterleavedAttributeDataBenchmark::initializeBenchmark() ...@@ -95,7 +95,7 @@ void InterleavedAttributeDataBenchmark::initializeBenchmark()
"}"; "}";
mPointSpriteProgram = CompileProgram(vs, fs); mPointSpriteProgram = CompileProgram(vs, fs);
ASSERT_TRUE(mPointSpriteProgram != 0); ASSERT_NE(0u, mPointSpriteProgram);
glClearColor(0.0f, 1.0f, 0.0f, 1.0f); glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
......
src/tests/perf_tests/PointSprites.cpp
...@@ -88,7 +88,7 @@ void PointSpritesBenchmark::initializeBenchmark() ...@@ -88,7 +88,7 @@ void PointSpritesBenchmark::initializeBenchmark()
const auto &params = GetParam(); const auto &params = GetParam();
mDrawIterations = params.iterations; mDrawIterations = params.iterations;
ASSERT_TRUE(params.iterations > 0); ASSERT_LT(0u, params.iterations);
std::stringstream vstrstr; std::stringstream vstrstr;
...@@ -144,7 +144,7 @@ void PointSpritesBenchmark::initializeBenchmark() ...@@ -144,7 +144,7 @@ void PointSpritesBenchmark::initializeBenchmark()
"}\n"; "}\n";
mProgram = CompileProgram(vstrstr.str(), fstrstr.str()); mProgram = CompileProgram(vstrstr.str(), fstrstr.str());
ASSERT_TRUE(mProgram != 0); ASSERT_NE(0u, mProgram);
// Use the program object // Use the program object
glUseProgram(mProgram); glUseProgram(mProgram);
...@@ -161,17 +161,17 @@ void PointSpritesBenchmark::initializeBenchmark() ...@@ -161,17 +161,17 @@ void PointSpritesBenchmark::initializeBenchmark()
glBindBuffer(GL_ARRAY_BUFFER, mBuffer); glBindBuffer(GL_ARRAY_BUFFER, mBuffer);
glBufferData(GL_ARRAY_BUFFER, vertexPositions.size() * sizeof(float), &vertexPositions[0], GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, vertexPositions.size() * sizeof(float), &vertexPositions[0], GL_STATIC_DRAW);
int positionLocation = glGetAttribLocation(mProgram, "vPosition"); GLint positionLocation = glGetAttribLocation(mProgram, "vPosition");
ASSERT_TRUE(positionLocation != -1); ASSERT_NE(-1, positionLocation);
glVertexAttribPointer(positionLocation, 2, GL_FLOAT, GL_FALSE, 0, NULL); glVertexAttribPointer(positionLocation, 2, GL_FLOAT, GL_FALSE, 0, nullptr);
glEnableVertexAttribArray(positionLocation); glEnableVertexAttribArray(positionLocation);
// Set the viewport // Set the viewport
glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight()); glViewport(0, 0, getWindow()->getWidth(), getWindow()->getHeight());
int pointSizeLocation = glGetUniformLocation(mProgram, "uPointSize"); GLint pointSizeLocation = glGetUniformLocation(mProgram, "uPointSize");
ASSERT_TRUE(pointSizeLocation != -1); ASSERT_NE(-1, pointSizeLocation);
glUniform1f(pointSizeLocation, params.size); glUniform1f(pointSizeLocation, params.size);
......
src/tests/perf_tests/TexSubImage.cpp
...@@ -99,7 +99,7 @@ TexSubImageBenchmark::TexSubImageBenchmark() ...@@ -99,7 +99,7 @@ TexSubImageBenchmark::TexSubImageBenchmark()
mTexture(0), mTexture(0),
mVertexBuffer(0), mVertexBuffer(0),
mIndexBuffer(0), mIndexBuffer(0),
mPixels(NULL) mPixels(nullptr)
{ {
} }
...@@ -157,7 +157,7 @@ void TexSubImageBenchmark::initializeBenchmark() ...@@ -157,7 +157,7 @@ void TexSubImageBenchmark::initializeBenchmark()
); );
mProgram = CompileProgram(vs, fs); mProgram = CompileProgram(vs, fs);
ASSERT_TRUE(mProgram != 0); ASSERT_NE(0u, mProgram);
// Get the attribute locations // Get the attribute locations
mPositionLoc = glGetAttribLocation(mProgram, "a_position"); mPositionLoc = glGetAttribLocation(mProgram, "a_position");
......
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