Commit 9b1a9084 by Jamie Madill Committed by Commit Bot

dEQP: Format display factory and clean up style.

This fixes a bunch of minor style issues. Bug: angleproject:2552 Change-Id: If0e8130cf85deb176a5dcbca568cca477d2c1068 Reviewed-on: https://chromium-review.googlesource.com/1062789Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 78b7f3a8
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "angle_deqp_libtester.h" #include "angle_deqp_libtester.h"
#include "common/Optional.h"
#include "common/angleutils.h" #include "common/angleutils.h"
#include "common/debug.h" #include "common/debug.h"
#include "common/Optional.h"
#include "common/platform.h" #include "common/platform.h"
#include "common/string_utils.h" #include "common/string_utils.h"
#include "gpu_test_expectations_parser.h" #include "gpu_test_expectations_parser.h"
...@@ -119,8 +119,7 @@ void Die() ...@@ -119,8 +119,7 @@ void Die()
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
Optional<std::string> FindTestExpectationsPath(const std::string &exeDir, Optional<std::string> FindTestExpectationsPath(const std::string &exeDir, size_t testModuleIndex)
size_t testModuleIndex)
{ {
for (const char *testPath : gTestExpectationsSearchPaths) for (const char *testPath : gTestExpectationsSearchPaths)
{ {
...@@ -146,12 +145,8 @@ class dEQPCaseList ...@@ -146,12 +145,8 @@ class dEQPCaseList
struct CaseInfo struct CaseInfo
{ {
CaseInfo(const std::string &dEQPName, CaseInfo(const std::string &dEQPName, const std::string &gTestName, int expectation)
const std::string &gTestName, : mDEQPName(dEQPName), mGTestName(gTestName), mExpectation(expectation)
int expectation)
: mDEQPName(dEQPName),
mGTestName(gTestName),
mExpectation(expectation)
{ {
} }
...@@ -184,8 +179,7 @@ class dEQPCaseList ...@@ -184,8 +179,7 @@ class dEQPCaseList
}; };
dEQPCaseList::dEQPCaseList(size_t testModuleIndex) dEQPCaseList::dEQPCaseList(size_t testModuleIndex)
: mTestModuleIndex(testModuleIndex), : mTestModuleIndex(testModuleIndex), mInitialized(false)
mInitialized(false)
{ {
} }
...@@ -322,9 +316,9 @@ class dEQPTest : public testing::TestWithParam<size_t> ...@@ -322,9 +316,9 @@ class dEQPTest : public testing::TestWithParam<size_t>
}; };
template <size_t TestModuleIndex> template <size_t TestModuleIndex>
unsigned int dEQPTest<TestModuleIndex>::sPasses = 0; unsigned int dEQPTest<TestModuleIndex>::sPasses = 0;
template <size_t TestModuleIndex> template <size_t TestModuleIndex>
unsigned int dEQPTest<TestModuleIndex>::sFails = 0; unsigned int dEQPTest<TestModuleIndex>::sFails = 0;
template <size_t TestModuleIndex> template <size_t TestModuleIndex>
unsigned int dEQPTest<TestModuleIndex>::sUnexpectedPasses = 0; unsigned int dEQPTest<TestModuleIndex>::sUnexpectedPasses = 0;
...@@ -467,7 +461,7 @@ void DeleteArg(int *argc, int argIndex, char **argv) ...@@ -467,7 +461,7 @@ void DeleteArg(int *argc, int argIndex, char **argv)
} }
} }
} // anonymous namespace } // anonymous namespace
// Called from main() to process command-line arguments. // Called from main() to process command-line arguments.
namespace angle namespace angle
......
...@@ -21,9 +21,9 @@ ...@@ -21,9 +21,9 @@
#ifndef TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_ #ifndef TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
#define TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_ #define TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
#include "tcuDefs.hpp"
#include "egluNativeDisplay.hpp" #include "egluNativeDisplay.hpp"
#include "eglwDefs.hpp" #include "eglwDefs.hpp"
#include "tcuDefs.hpp"
namespace tcu namespace tcu
{ {
...@@ -31,10 +31,7 @@ namespace tcu ...@@ -31,10 +31,7 @@ namespace tcu
class EventState class EventState
{ {
public: public:
EventState() EventState() : mQuit(false) {}
: mQuit(false)
{
}
bool quitSignaled() const { return mQuit; }; bool quitSignaled() const { return mQuit; };
void signalQuitEvent() { mQuit = true; }; void signalQuitEvent() { mQuit = true; };
...@@ -47,16 +44,16 @@ class ANGLENativeDisplayFactory : public eglu::NativeDisplayFactory ...@@ -47,16 +44,16 @@ class ANGLENativeDisplayFactory : public eglu::NativeDisplayFactory
public: public:
ANGLENativeDisplayFactory(const std::string &name, ANGLENativeDisplayFactory(const std::string &name,
const std::string &description, const std::string &description,
const std::vector<eglw::EGLAttrib> &platformAttributes, std::vector<eglw::EGLAttrib> platformAttributes,
EventState *eventState); EventState *eventState);
~ANGLENativeDisplayFactory() override; ~ANGLENativeDisplayFactory() override;
eglu::NativeDisplay *createDisplay(const eglw::EGLAttrib* attribList) const override; eglu::NativeDisplay *createDisplay(const eglw::EGLAttrib *attribList) const override;
private: private:
std::vector<eglw::EGLAttrib> mPlatformAttributes; std::vector<eglw::EGLAttrib> mPlatformAttributes;
}; };
} // tcu } // tcu
#endif // TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_ #endif // TCU_ANGLE_WIN32_NATIVE_DISPLAY_FACTORY_H_
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