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
Revert "[Tizen] To get MaxTextureSize by using glGetIntegerv not by using environment...
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
graphics
/
gles
/
gl-implementation.h
diff --git
a/dali/internal/graphics/gles/gl-implementation.h
b/dali/internal/graphics/gles/gl-implementation.h
index
9ccc015
..
8c279f4
100644
(file)
--- a/
dali/internal/graphics/gles/gl-implementation.h
+++ b/
dali/internal/graphics/gles/gl-implementation.h
@@
-23,7
+23,6
@@
#include <cstdlib>
#include <GLES2/gl2.h>
#include <dali/integration-api/gl-abstraction.h>
#include <cstdlib>
#include <GLES2/gl2.h>
#include <dali/integration-api/gl-abstraction.h>
-#include <dali/devel-api/threading/conditional-wait.h>
// INTERNAL INCLUDES
#include <dali/internal/graphics/gles/gles-abstraction.h>
// INTERNAL INCLUDES
#include <dali/internal/graphics/gles/gles-abstraction.h>
@@
-50,10
+49,7
@@
class GlImplementation : public Dali::Integration::GlAbstraction
public:
GlImplementation()
: mGlesVersion( 30 ),
public:
GlImplementation()
: mGlesVersion( 30 ),
- mIsSurfacelessContextSupported( false ),
- mIsContextCreated( false ),
- mContextCreatedWaitCondition(),
- mMaxTextureSize( 0 )
+ mIsSurfacelessContextSupported( false )
{
mImpl.reset( new Gles3Implementation() );
}
{
mImpl.reset( new Gles3Implementation() );
}
@@
-70,17
+66,6
@@
public:
/* Do nothing in main implementation */
}
/* Do nothing in main implementation */
}
- void ContextCreated()
- {
- glGetIntegerv( GL_MAX_TEXTURE_SIZE, &mMaxTextureSize );
-
- if( !mIsContextCreated )
- {
- mContextCreatedWaitCondition.Notify();
- }
- mIsContextCreated = true;
- }
-
void SetGlesVersion( const int32_t glesVersion )
{
if( mGlesVersion != glesVersion )
void SetGlesVersion( const int32_t glesVersion )
{
if( mGlesVersion != glesVersion )
@@
-118,15
+103,6
@@
public:
return convert;
}
return convert;
}
- int GetMaxTextureSize()
- {
- if( !mIsContextCreated )
- {
- mContextCreatedWaitCondition.Wait();
- }
- return mMaxTextureSize;
- }
-
/* OpenGL ES 2.0 */
void ActiveTexture( GLenum texture )
/* OpenGL ES 2.0 */
void ActiveTexture( GLenum texture )
@@
-1364,9
+1340,6
@@
public:
private:
int32_t mGlesVersion;
bool mIsSurfacelessContextSupported;
private:
int32_t mGlesVersion;
bool mIsSurfacelessContextSupported;
- bool mIsContextCreated;
- ConditionalWait mContextCreatedWaitCondition;
- GLint mMaxTextureSize;
std::unique_ptr<GlesAbstraction> mImpl;
};
std::unique_ptr<GlesAbstraction> mImpl;
};