X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Frenderers%2Fscene-graph-renderer.cpp;h=352d57866d3925e19f2eae53737dad2aaa7bf542;hb=45807abad587645448dd4f856fa9a00e4e28f2e0;hp=55fdbddd48ab3a599fb792d13a8f8a81e0c9509d;hpb=f2643f26518c26bfc135973a6d33d7ac8d9700fc;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/render/renderers/scene-graph-renderer.cpp b/dali/internal/render/renderers/scene-graph-renderer.cpp index 55fdbdd..352d578 100644 --- a/dali/internal/render/renderers/scene-graph-renderer.cpp +++ b/dali/internal/render/renderers/scene-graph-renderer.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,8 @@ namespace Internal namespace { + + static Matrix gModelViewProjectionMatrix( false ); ///< a shared matrix to calculate the MVP matrix, dont want to store it locally to reduce storage overhead static Matrix3 gNormalMatrix; ///< a shared matrix to calculate normal matrix, dont want to store it locally to reduce storage overhead @@ -99,6 +102,7 @@ inline void SetMatrices( Program& program, program.SetUniformMatrix3fv( loc, 1, gNormalMatrix.AsFloat() ); } } + } namespace SceneGraph @@ -183,6 +187,7 @@ void Renderer::Render( BufferIndex bufferIndex, return; } } + // Take the program into use so we can send uniforms to it program.Use(); @@ -240,6 +245,7 @@ void Renderer::Render( BufferIndex bufferIndex, Renderer::Renderer( RenderDataProvider& dataprovider ) : mDataProvider( dataprovider ), mContext( NULL ), + mTextureCache( NULL ), mShader( NULL ), mSamplerBitfield( ImageSampler::DefaultOptions() ),