[dali_1.2.40] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / render / renderers / render-frame-buffer.h

diff --git a/dali/internal/render/renderers/render-frame-buffer.h b/dali/internal/render/renderers/render-frame-buffer.h
index 9240c69..942e5b3 100644 (file)
--- a/dali/internal/render/renderers/render-frame-buffer.h
+++ b/dali/internal/render/renderers/render-frame-buffer.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_RENDER_FRAME_BUFFER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -22,7 +22,6 @@
 #include <dali/internal/render/gl-resources/context.h>
 #include <dali/internal/render/renderers/render-sampler.h>
 #include <dali/integration-api/gl-defines.h>
-#include <dali/integration-api/resource-declarations.h>
 
 namespace Dali
 {
@@ -30,7 +29,7 @@ namespace Internal
 {
 namespace Render
 {
-class NewTexture;
+class Texture;
 
 class FrameBuffer
 {
@@ -73,7 +72,7 @@ public:
    * @param[in] mipmapLevel The mipmap of the texture to be attached
    * @param[in] layer Indicates which layer of a cube map or array texture to attach. Unused for 2D textures
    */
-  void AttachColorTexture( Context& context, Render::NewTexture* texture, unsigned int mipmapLevel, unsigned int layer );
+  void AttachColorTexture( Context& context, Render::Texture* texture, unsigned int mipmapLevel, unsigned int layer );
 
   /**
    * @brief Bind the framebuffer