X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fgl-resources%2Fcontext.cpp;h=ead1be3ad6b423611743311f27958970cf803d08;hb=79881246746f65474b24ea4fe14151ccef8df3f4;hp=041565ed03ea82dbc0d76cbfa2a1a375a167d08c;hpb=7e670cd9cb16d7b93787a147088d67f87086f8b8;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/gl-resources/context.cpp b/dali/internal/render/gl-resources/context.cpp
index 041565e..ead1be3 100644
--- a/dali/internal/render/gl-resources/context.cpp
+++ b/dali/internal/render/gl-resources/context.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -21,9 +21,9 @@
 // EXTERNAL INCLUDES
 #include <algorithm>
 #include <cstring>
+#include <type_traits>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/common/compile-time-assert.h>
 #include <dali/public-api/common/constants.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/integration-api/platform-abstraction.h>
@@ -39,7 +39,7 @@ namespace Internal
 namespace // unnamed namespace
 {
 
-DALI_COMPILE_TIME_ASSERT( TEXTURE_UNIT_LAST <= Context::MAX_TEXTURE_UNITS );
+static_assert( TEXTURE_UNIT_LAST <= Context::MAX_TEXTURE_UNITS, "TEXTURE_UNIT_LAST is greater than Context::MAX_TEXTURE_UNITS" );
 
 /**
  * GL error strings
@@ -64,7 +64,12 @@ errorStrings errors[] =
 Debug::Filter* gContextLogFilter = Debug::Filter::New(Debug::Concise, false, "LOG_CONTEXT_STATE");
 #endif
 
-Context::Context(Integration::GlAbstraction& glAbstraction)
+Context::Context( Integration::GlAbstraction& glAbstraction )
+: Context( glAbstraction, nullptr )
+{
+}
+
+Context::Context( Integration::GlAbstraction& glAbstraction, std::vector< Context* >* contexts )
 : mGlAbstraction(glAbstraction),
   mGlContextCreated(false),
   mColorMask(true),
@@ -91,11 +96,18 @@ Context::Context(Integration::GlAbstraction& glAbstraction)
   mBlendFuncSeparateDstAlpha(GL_ZERO),
   mBlendEquationSeparateModeRGB( GL_FUNC_ADD ),
   mBlendEquationSeparateModeAlpha( GL_FUNC_ADD ),
+  mStencilFunc( GL_ALWAYS ),
+  mStencilFuncRef( 0 ),
+  mStencilFuncMask( 0xFFFFFFFF ),
+  mStencilOpFail( GL_KEEP ),
+  mStencilOpDepthFail( GL_KEEP ),
+  mStencilOpDepthPass( GL_KEEP ),
   mDepthFunction( GL_LESS ),
   mMaxTextureSize(0),
   mClearColor(Color::WHITE),    // initial color, never used until it's been set by the user
   mCullFaceMode( FaceCullingMode::NONE ),
-  mViewPort( 0, 0, 0, 0 )
+  mViewPort( 0, 0, 0, 0 ),
+  mSceneContexts( contexts )
 {
 }
 
@@ -241,7 +253,7 @@ void Context::InitializeGlState()
   memset( &mVertexAttributeCurrentState, 0, sizeof(mVertexAttributeCurrentState) );
 
   //Initialize bound 2d texture cache
-  memset( &mBound2dTextureId, 0, sizeof(mBound2dTextureId) );
+  memset( &mBoundTextureId, 0, sizeof(mBoundTextureId) );
 
   mFrameBufferStateCache.Reset();
 }