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

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / sampler-impl.h

diff --git a/dali/internal/event/rendering/sampler-impl.h b/dali/internal/event/rendering/sampler-impl.h
index 387147f..fc43ebd 100644 (file)
--- a/dali/internal/event/rendering/sampler-impl.h
+++ b/dali/internal/event/rendering/sampler-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_SAMPLER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * 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.
@@ -22,11 +22,10 @@
 #include <dali/public-api/actors/sampling.h>
 #include <dali/public-api/common/dali-common.h> // DALI_ASSERT_ALWAYS
 #include <dali/public-api/common/intrusive-ptr.h> // Dali::IntrusivePtr
-#include <dali/devel-api/rendering/sampler.h> // Dali::Sampler
+#include <dali/public-api/rendering/sampler.h> // Dali::Sampler
 #include <dali/internal/event/common/connectable.h> // Dali::Internal::Connectable
 #include <dali/internal/event/common/object-connector.h> // Dali::Internal::ObjectConnector
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
-#include <dali/internal/event/images/image-connector.h> // Dali::Internal::ImageConnector
 
 namespace Dali
 {
@@ -34,7 +33,7 @@ namespace Internal
 {
 namespace Render
 {
-class Sampler;
+struct Sampler;
 }
 
 class Sampler;
@@ -62,7 +61,7 @@ public:
   /**
    * @copydoc Dali::Sampler::SetWrapMode()
    */
-  void SetWrapMode( Dali::WrapMode::Type uWrap, Dali::WrapMode::Type vWrap );
+  void SetWrapMode( Dali::WrapMode::Type rWrap, Dali::WrapMode::Type sWrap, Dali::WrapMode::Type tWrap );
 
   /**
    * Get the render thread sampler