projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[dali-toolkit] fix set max character length when text already set" into devel...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-gl-context-helper-abstraction.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h
index
0442f0d
..
1a5a54c
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-context-helper-abstraction.h
@@
-2,7
+2,7
@@
#define TEST_GL_CONTEXT_HELPER_ABSTRACTION_H
/*
#define TEST_GL_CONTEXT_HELPER_ABSTRACTION_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,49
+23,42
@@
namespace Dali
{
namespace Dali
{
-
/**
* Class to emulate the GL context helper
*/
/**
* Class to emulate the GL context helper
*/
-class DALI_CORE_API TestGlContextHelperAbstraction: public Integration::GlContextHelperAbstraction
+class DALI_CORE_API TestGlContextHelperAbstraction
: public Integration::GlContextHelperAbstraction
{
public:
/**
* Constructor
*/
{
public:
/**
* Constructor
*/
- TestGlContextHelperAbstraction()
{};
+ TestGlContextHelperAbstraction(){};
/**
* Destructor
*/
/**
* Destructor
*/
- ~TestGlContextHelperAbstraction() {};
+ ~TestGlContextHelperAbstraction()
override
{};
/**
* @brief Switch to the surfaceless GL context
*/
/**
* @brief Switch to the surfaceless GL context
*/
- virtual void MakeSurfacelessContextCurrent() {};
-
- /**
- * @brief Switch to the GL context of the specific render surface
- * @param[in] surface The render surface
- */
- virtual void MakeContextCurrent( Integration::RenderSurface* surface ) {};
+ void MakeSurfacelessContextCurrent() override{};
/**
* @brief Clear the GL context
*/
/**
* @brief Clear the GL context
*/
- v
irtual void MakeContextNull()
{};
+ v
oid MakeContextNull() override
{};
/**
* @brief Wait until all GL rendering calls for the current GL context are executed
*/
/**
* @brief Wait until all GL rendering calls for the current GL context are executed
*/
- virtual void WaitClient() {};
-private:
+ void WaitClient() override{};
- TestGlContextHelperAbstraction( const TestGlContextHelperAbstraction& ); ///< Undefined
- TestGlContextHelperAbstraction& operator=( const TestGlContextHelperAbstraction& ); ///< Undefined
+private:
+ TestGlContextHelperAbstraction(const TestGlContextHelperAbstraction&); ///< Undefined
+ TestGlContextHelperAbstraction& operator=(const TestGlContextHelperAbstraction&); ///< Undefined
};
};
-} // Dali
+} //
namespace
Dali
#endif // TEST_GL_CONTEXT_HELPER_ABSTRACTION_H
#endif // TEST_GL_CONTEXT_HELPER_ABSTRACTION_H