projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed GL and GL Sync implementations
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
graphics
/
common
/
render-helper.cpp
diff --git
a/dali/internal/graphics/common/render-helper.cpp
b/dali/internal/graphics/common/render-helper.cpp
index
2c82ecc
..
167360b
100644
(file)
--- a/
dali/internal/graphics/common/render-helper.cpp
+++ b/
dali/internal/graphics/common/render-helper.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-36,8
+36,7
@@
namespace Adaptor
{
RenderHelper::RenderHelper( AdaptorInternalServices& adaptorInterfaces )
{
RenderHelper::RenderHelper( AdaptorInternalServices& adaptorInterfaces )
-: mGLES( adaptorInterfaces.GetGlesInterface() ),
- mEglFactory( &adaptorInterfaces.GetEGLFactoryInterface()),
+: mEglFactory( &adaptorInterfaces.GetEGLFactoryInterface()),
mEGL( NULL ),
mGraphics( adaptorInterfaces.GetGraphics() ),
mSurfaceReplaced( false ),
mEGL( NULL ),
mGraphics( adaptorInterfaces.GetGraphics() ),
mSurfaceReplaced( false ),
@@
-163,9
+162,8
@@
bool RenderHelper::PreRender()
#if 0
if( mSurface )
{
#if 0
if( mSurface )
{
- mSurface->PreRender( *mEGL, m
GLES, m
SurfaceResized );
+ mSurface->PreRender( *mEGL, mSurfaceResized );
}
}
- mGLES.PreRender();
#endif
return true;
}
#endif
return true;
}
@@
-173,20
+171,17
@@
bool RenderHelper::PreRender()
void RenderHelper::PostRender( bool renderToFbo )
{
#if 0
void RenderHelper::PostRender( bool renderToFbo )
{
#if 0
- // Inform the gl implementation that rendering has finished before informing the surface
- mGLES.PostRender();
-
if( renderToFbo )
{
if( renderToFbo )
{
- mGLES.Flush();
- mGLES.Finish();
+
//
mGLES.Flush();
+
//
mGLES.Finish();
}
else
{
if( mSurface )
{
// Inform the surface that rendering this frame has finished.
}
else
{
if( mSurface )
{
// Inform the surface that rendering this frame has finished.
- mSurface->PostRender( *mEGL, m
GLES, m
DisplayConnection, mSurfaceReplaced, mSurfaceResized );
+ mSurface->PostRender( *mEGL, mDisplayConnection, mSurfaceReplaced, mSurfaceResized );
}
}
mSurfaceReplaced = false;
}
}
mSurfaceReplaced = false;