[3.0] Version downgrade (1.2.0 to 1.1.45)

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-algorithms.h

diff --git a/dali/internal/render/common/render-algorithms.h b/dali/internal/render/common/render-algorithms.h
index da249ae..a2e4c57 100644 (file)
--- a/dali/internal/render/common/render-algorithms.h
+++ b/dali/internal/render/common/render-algorithms.h
@@ -1,36 +1,37 @@
-#ifndef __DALI_INTERNAL_RENDER_ALGORITHMS_H__
-#define __DALI_INTERNAL_RENDER_ALGORITHMS_H__
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+#ifndef DALI_INTERNAL_RENDER_ALGORITHMS_H
+#define DALI_INTERNAL_RENDER_ALGORITHMS_H
+
+/*
+ * Copyright (c) 2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/internal/common/buffer-index.h>
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 class Context;
 
 namespace SceneGraph
 {
 class RenderInstruction;
+class Shader;
+class TextureCache;
 }
 
 namespace Render
@@ -40,13 +41,15 @@ namespace Render
  * Process a render-instruction.
  * @param[in] instruction The render-instruction to process.
  * @param[in] context The GL context.
- * @param[in] buffer The current render buffer index (previous update buffer)
- * @param[in] frameTime The elapsed time between the last two updates.
+ * @param[in] textureCache The texture cache used to get textures.
+ * @param[in] defaultShader The default shader.
+ * @param[in] bufferIndex The current render buffer index (previous update buffer)
  */
 void ProcessRenderInstruction( const SceneGraph::RenderInstruction& instruction,
                                Context& context,
-                               BufferIndex bufferIndex,
-                               float frameTime );
+                               SceneGraph::TextureCache& textureCache,
+                               SceneGraph::Shader& defaultShader,
+                               BufferIndex bufferIndex );
 
 } // namespace Render
 
@@ -54,5 +57,4 @@ void ProcessRenderInstruction( const SceneGraph::RenderInstruction& instruction,
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_RENDER_ALGORITHMS_H__
-
+#endif // DALI_INTERNAL_RENDER_ALGORITHMS_H