X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fshaders%2Fprogram-controller.cpp;h=cde611db67411026c765f2169f29bad376c5ec3c;hb=cd0ce6e412df8961b1a5e28b496369fa49fd72d7;hp=e4163db37303e696ce5e810912fb8ebf85cc0d8f;hpb=f2d82acacff4126511c6d8c54c7187181f4f9a95;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/render/shaders/program-controller.cpp b/dali/internal/render/shaders/program-controller.cpp index e4163db..cde611d 100644 --- a/dali/internal/render/shaders/program-controller.cpp +++ b/dali/internal/render/shaders/program-controller.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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,10 +21,8 @@ // INTERNAL INCLUDES #include #include -#include -#include -#include #include +#include namespace Dali { @@ -136,15 +134,14 @@ bool ProgramController::IsBinarySupported() return mNumberOfProgramBinaryFormats > 0; } -unsigned int ProgramController::ProgramBinaryFormat() +GLenum ProgramController::ProgramBinaryFormat() { return mProgramBinaryFormat; } -void ProgramController::StoreBinary( Integration::ShaderDataPtr programData ) +void ProgramController::StoreBinary( Internal::ShaderDataPtr programData ) { DALI_ASSERT_DEBUG( programData->GetBufferSize() > 0 ); - DALI_ASSERT_DEBUG( programData->GetHashValue() != 0 ); DALI_ASSERT_DEBUG( mShaderSaver && "SetShaderSaver() should have been called during startup." ); if( mShaderSaver != NULL )