It copies from GlView.
Change-Id: I7b26e752a0efd972b24e785aa2e661f5674bb132
END_TEST;
}
-int UtcDaliGlWindowSetEglConfigGles20(void)
+int UtcDaliGlWindowSetGraphicsConfigGles20(void)
{
Dali::GlWindow window;
try
{
- window.SetEglConfig(true, true, 0, Dali::GlWindow::GlesVersion::VERSION_2_0);
+ window.SetGraphicsConfig(true, true, 0, Dali::GlWindow::GlesVersion::VERSION_2_0);
DALI_TEST_CHECK(false);
}
END_TEST;
}
-int UtcDaliGlWindowSetEglConfigGles30(void)
+int UtcDaliGlWindowSetGraphicsConfigGles30(void)
{
Dali::GlWindow window;
try
{
- window.SetEglConfig(true, true, 0, Dali::GlWindow::GlesVersion::VERSION_3_0);
+ window.SetGraphicsConfig(true, true, 0, Dali::GlWindow::GlesVersion::VERSION_3_0);
DALI_TEST_CHECK(false);
}
{
}
-int UtcDaliGlWindowRegisterGlCallback(void)
+int UtcDaliGlWindowRegisterGlCallbacks(void)
{
Dali::GlWindow window;
try
{
- window.RegisterGlCallback(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+ window.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
DALI_TEST_CHECK(false);
}
try
{
- window.RegisterGlCallback(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
+ window.RegisterGlCallbacks(Dali::MakeCallback(glInit), Dali::MakeCallback(glRenderFrame), Dali::MakeCallback(glTerminate));
window.RenderOnce();
DALI_TEST_CHECK(false);
GlWindow& GlWindow::operator=(GlWindow&& rhs) = default;
-void GlWindow::SetEglConfig(bool depth, bool stencil, int msaa, GlesVersion version)
+void GlWindow::SetGraphicsConfig(bool depth, bool stencil, int msaa, GlesVersion version)
{
- GetImplementation(*this).SetEglConfig(depth, stencil, msaa, version);
+ GetImplementation(*this).SetGraphicsConfig(depth, stencil, msaa, version);
}
void GlWindow::Raise()
GetImplementation(*this).SetPreferredOrientation(orientation);
}
-void GlWindow::RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+void GlWindow::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
{
- GetImplementation(*this).RegisterGlCallback(initCallback, renderFrameCallback, terminateCallback);
+ GetImplementation(*this).RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
}
void GlWindow::RenderOnce()
GlWindow& operator=(GlWindow&& rhs);
/**
- * @brief Sets egl configuration for GlWindow
+ * @brief Sets graphics configuration for GlWindow
*
* @param[in] depth the flag of depth buffer. If true is set, 24bit depth buffer is enabled.
* @param[in] stencil the flag of stencil. it true is set, 8bit stencil buffer is enabled.
* @param[in] version the GLES version
*
*/
- void SetEglConfig(bool depth, bool stencil, int msaa, GlesVersion version);
+ void SetGraphicsConfig(bool depth, bool stencil, int msaa, GlesVersion version);
/**
* @brief Raises GlWindow to the top of GlWindow stack.
* @endcode
* This callback is called when GlWindow is deleted.
*/
- void RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+ void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
/**
* @brief Renders once more even if GL render functions are not added to idler.
mWindowBase->SetClass(name, className);
}
-void GlWindow::SetEglConfig(bool depth, bool stencil, int msaa, Dali::GlWindow::GlesVersion version)
+void GlWindow::SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::GlWindow::GlesVersion version)
{
// Init Graphics
mDepth = depth;
rVersion = 30;
}
- mGlWindowRenderThread->SetEglConfig(depth, stencil, msaa, rVersion);
+ mGlWindowRenderThread->SetGraphicsConfig(depth, stencil, msaa, rVersion);
}
void GlWindow::Raise()
}
}
-void GlWindow::RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
+void GlWindow::RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback)
{
if(mIsEGLInitialized == false)
{
InitializeGraphics();
}
- mGlWindowRenderThread->RegisterGlCallback(initCallback, renderFrameCallback, terminateCallback);
+ mGlWindowRenderThread->RegisterGlCallbacks(initCallback, renderFrameCallback, terminateCallback);
mGlWindowRenderThread->Start();
}
static GlWindow* New(const PositionSize& positionSize, const std::string& name, const std::string& className, bool isTransparent = false);
/**
- * @copydoc Dali::GlWindow::SetEglConfig()
+ * @copydoc Dali::GlWindow::SetGraphicsConfig()
*/
- void SetEglConfig(bool depth, bool stencil, int msaa, Dali::GlWindow::GlesVersion version);
+ void SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::GlWindow::GlesVersion version);
/**
* @copydoc Dali::GlWindow::Raise()
void SetPreferredOrientation(WindowOrientation orientation);
/**
- * @copydoc Dali::GlWindow::RegisterGlCallback()
+ * @copydoc Dali::GlWindow::RegisterGlCallbacks()
*/
- void RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+ void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
/**
* @copydoc Dali::GlWindow::RenderOnce()
mWindowBase = windowBase;
}
-void GlWindowRenderThread::SetEglConfig(bool depth, bool stencil, int msaa, int version)
+void GlWindowRenderThread::SetGraphicsConfig(bool depth, bool stencil, int msaa, int version)
{
mDepth = depth;
mStencil = stencil;
mRenderThreadWaitCondition.Notify(lock);
}
-void GlWindowRenderThread::RegisterGlCallback(CallbackBase* initCallback,
+void GlWindowRenderThread::RegisterGlCallbacks(CallbackBase* initCallback,
CallbackBase* renderFrameCallback,
CallbackBase* terminateCallback)
{
void SetWindowBase(WindowBase* windowBase);
/**
- * @brief Sets egl configuration for GlWindow
+ * @brief Sets graphics configuration for GlWindow
*
* @param[in] depth the flag of depth buffer. If true is set, 24bit depth buffer is enabled.
* @param[in] stencil the flag of stencil. it true is set, 8bit stencil buffer is enabled.
* @param[in] version the GLES version.
*
*/
- void SetEglConfig(bool depth, bool stencil, int msaa, int version);
+ void SetGraphicsConfig(bool depth, bool stencil, int msaa, int version);
/**
* Pauses the Render Thread.
void Stop();
/**
- * @copydoc Dali::GlWindow::RegisterGlCallback()
+ * @copydoc Dali::GlWindow::RegisterGlCallbacks()
*/
- void RegisterGlCallback(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+ void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
/**
* Enable OnDemand Rendering Mode