Rename shader.h/cpp to scene-graph-shader.h/cpp

Change-Id: I2d5b411f9db84004bc1be6eb8d43e04892035319

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp
index e10a999..f4d52d3 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-ResourceClient.cpp
@@ -35,7 +35,7 @@
 #include <dali/internal/event/images/resource-image-impl.h>
 #include <dali/integration-api/resource-cache.h>
 #include <dali/internal/render/gl-resources/texture-declarations.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/common/owner-pointer.h>
 #include <dali/public-api/shader-effects/shader-effect.h>
 

diff --git a/dali/internal/event/effects/shader-effect-impl.cpp b/dali/internal/event/effects/shader-effect-impl.cpp
index fbdca05..161e4bc 100644 (file)
--- a/dali/internal/event/effects/shader-effect-impl.cpp
+++ b/dali/internal/event/effects/shader-effect-impl.cpp
@@ -31,7 +31,7 @@
 #include <dali/internal/event/effects/shader-declarations.h>
 #include <dali/internal/event/effects/shader-factory.h>
 #include <dali/internal/event/images/image-impl.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/render/shaders/uniform-meta.h>
 #include <dali/internal/update/animation/scene-graph-constraint-base.h>
 #include <dali/internal/update/common/animatable-property.h>

diff --git a/dali/internal/event/effects/shader-effect-impl.h b/dali/internal/event/effects/shader-effect-impl.h
index 09b7a25..941735f 100644 (file)
--- a/dali/internal/event/effects/shader-effect-impl.h
+++ b/dali/internal/event/effects/shader-effect-impl.h
@@ -24,8 +24,7 @@
 #include <dali/internal/event/effects/shader-declarations.h>
 #include <dali/internal/event/common/object-impl.h>
 #include <dali/internal/event/resources/resource-ticket.h>
-#include <dali/internal/render/shaders/shader.h>
-
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 namespace Dali
 {

diff --git a/dali/internal/file.list b/dali/internal/file.list
index 73642ac..633a58d 100644 (file)
--- a/dali/internal/file.list
+++ b/dali/internal/file.list
@@ -141,7 +141,7 @@ internal_src_files = \
   $(internal_src_dir)/render/shaders/custom-uniform.cpp \
   $(internal_src_dir)/render/shaders/program.cpp \
   $(internal_src_dir)/render/shaders/program-controller.cpp \
-  $(internal_src_dir)/render/shaders/shader.cpp \
+  $(internal_src_dir)/render/shaders/scene-graph-shader.cpp \
   \
   $(internal_src_dir)/update/animation/scene-graph-animation.cpp \
   $(internal_src_dir)/update/animation/scene-graph-constraint-base.cpp \

diff --git a/dali/internal/render/renderers/scene-graph-image-renderer.cpp b/dali/internal/render/renderers/scene-graph-image-renderer.cpp
index 50853c3..ad9b96b 100644 (file)
--- a/dali/internal/render/renderers/scene-graph-image-renderer.cpp
+++ b/dali/internal/render/renderers/scene-graph-image-renderer.cpp
@@ -31,7 +31,7 @@
 #include <dali/internal/render/gl-resources/texture-units.h>
 #include <dali/internal/render/renderers/scene-graph-renderer-debug.h>
 #include <dali/internal/render/shaders/program.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/update/controllers/scene-controller.h>
 
 namespace

diff --git a/dali/internal/render/renderers/scene-graph-renderer.cpp b/dali/internal/render/renderers/scene-graph-renderer.cpp
index 6bf81c0..6e05c9d 100644 (file)
--- a/dali/internal/render/renderers/scene-graph-renderer.cpp
+++ b/dali/internal/render/renderers/scene-graph-renderer.cpp
@@ -21,7 +21,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/render/gl-resources/context.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/render/shaders/program.h>
 #include <dali/internal/render/renderers/scene-graph-renderer-debug.h>
 #include <dali/internal/render/renderers/render-data-provider.h>

diff --git a/dali/internal/render/renderers/scene-graph-text-renderer.cpp b/dali/internal/render/renderers/scene-graph-text-renderer.cpp
index 7ed5e8c..1dc0484 100644 (file)
--- a/dali/internal/render/renderers/scene-graph-text-renderer.cpp
+++ b/dali/internal/render/renderers/scene-graph-text-renderer.cpp
@@ -33,7 +33,7 @@
 #include <dali/internal/render/common/vertex.h>
 #include <dali/internal/render/renderers/scene-graph-renderer-debug.h>
 #include <dali/internal/render/shaders/program.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/update/controllers/scene-controller.h>
 
 #if defined(DEBUG_ENABLED)

diff --git a/dali/internal/render/shaders/shader.cpp b/dali/internal/render/shaders/scene-graph-shader.cpp
similarity index 99%
rename from dali/internal/render/shaders/shader.cpp
rename to dali/internal/render/shaders/scene-graph-shader.cpp
index 7c1bdc2..90d5046 100644 (file)
--- a/dali/internal/render/shaders/shader.cpp
+++ b/dali/internal/render/shaders/scene-graph-shader.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/render/queue/render-queue.h>

diff --git a/dali/internal/render/shaders/shader.h b/dali/internal/render/shaders/scene-graph-shader.h
similarity index 100%
rename from dali/internal/render/shaders/shader.h
rename to dali/internal/render/shaders/scene-graph-shader.h

diff --git a/dali/internal/update/common/discard-queue.cpp b/dali/internal/update/common/discard-queue.cpp
index 2b944de..164035b 100644 (file)
--- a/dali/internal/update/common/discard-queue.cpp
+++ b/dali/internal/update/common/discard-queue.cpp
@@ -25,7 +25,7 @@
 #include <dali/internal/render/queue/render-queue.h>
 #include <dali/internal/update/node-attachments/scene-graph-renderable-attachment.h>
 #include <dali/internal/render/renderers/scene-graph-renderer.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/manager/prepare-render-algorithms.cpp b/dali/internal/update/manager/prepare-render-algorithms.cpp
index 7f545a6..ae7ba34 100644 (file)
--- a/dali/internal/update/manager/prepare-render-algorithms.cpp
+++ b/dali/internal/update/manager/prepare-render-algorithms.cpp
@@ -24,7 +24,7 @@
 #include <dali/internal/update/nodes/scene-graph-layer.h>
 #include <dali/internal/render/renderers/scene-graph-renderer.h>
 #include <dali/internal/render/common/render-instruction.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index 8bb42bf..33ebb76 100644 (file)
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -62,7 +62,7 @@
 #include <dali/internal/render/queue/render-queue.h>
 #include <dali/internal/render/common/performance-monitor.h>
 #include <dali/internal/render/gl-resources/texture-cache.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 #ifdef DYNAMICS_SUPPORT
 #include <dali/integration-api/dynamics/dynamics-world-settings.h>

diff --git a/dali/internal/update/manager/update-manager.h b/dali/internal/update/manager/update-manager.h
index 5636c5e..47c047a 100644 (file)
--- a/dali/internal/update/manager/update-manager.h
+++ b/dali/internal/update/manager/update-manager.h
@@ -24,7 +24,7 @@
 #include <dali/integration-api/resource-declarations.h>
 #include <dali/internal/common/message.h>
 #include <dali/internal/common/event-to-update.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/update/nodes/node.h>
 #include <dali/internal/update/node-attachments/node-attachment.h>
 #include <dali/internal/update/common/scene-graph-buffers.h>

diff --git a/dali/internal/update/node-attachments/scene-graph-image-attachment.cpp b/dali/internal/update/node-attachments/scene-graph-image-attachment.cpp
index 803b557..9390463 100644 (file)
--- a/dali/internal/update/node-attachments/scene-graph-image-attachment.cpp
+++ b/dali/internal/update/node-attachments/scene-graph-image-attachment.cpp
@@ -35,7 +35,7 @@
 #include <dali/internal/render/common/performance-monitor.h>
 #include <dali/internal/render/renderers/scene-graph-image-renderer.h>
 #include <dali/internal/render/renderers/scene-graph-renderer-declarations.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 #include <dali/internal/update/node-attachments/scene-graph-image-attachment-debug.h>
 

diff --git a/dali/internal/update/node-attachments/scene-graph-renderable-attachment.cpp b/dali/internal/update/node-attachments/scene-graph-renderable-attachment.cpp
index 93d4f4c..ac18ea1 100644 (file)
--- a/dali/internal/update/node-attachments/scene-graph-renderable-attachment.cpp
+++ b/dali/internal/update/node-attachments/scene-graph-renderable-attachment.cpp
@@ -27,7 +27,7 @@
 #include <dali/internal/update/resources/resource-tracker.h>
 #include <dali/internal/render/queue/render-queue.h>
 #include <dali/internal/render/renderers/scene-graph-renderer.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/common/image-sampler.h>
 
 namespace Dali

diff --git a/dali/internal/update/node-attachments/scene-graph-text-attachment.cpp b/dali/internal/update/node-attachments/scene-graph-text-attachment.cpp
index ae81d64..adfb456 100644 (file)
--- a/dali/internal/update/node-attachments/scene-graph-text-attachment.cpp
+++ b/dali/internal/update/node-attachments/scene-graph-text-attachment.cpp
@@ -29,7 +29,7 @@
 #include <dali/internal/render/common/vertex.h>
 #include <dali/internal/render/renderers/scene-graph-text-renderer.h>
 #include <dali/internal/render/renderers/scene-graph-renderer-declarations.h>
-#include <dali/internal/render/shaders/shader.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 #include <dali/internal/update/controllers/render-message-dispatcher.h>
 #include <dali/internal/update/controllers/scene-controller.h>
 #include <dali/internal/update/nodes/node.h>