[scenic] Move escher examples //garnet -> //src
SCN-1392 #done
Change-Id: I36333806fd9dd5b3183399f668207a68a85de24d
diff --git a/garnet/examples/ui/shadertoy/service/BUILD.gn b/garnet/examples/ui/shadertoy/service/BUILD.gn
index 4933541..49a8804 100644
--- a/garnet/examples/ui/shadertoy/service/BUILD.gn
+++ b/garnet/examples/ui/shadertoy/service/BUILD.gn
@@ -27,7 +27,6 @@
deps = [
"services",
- "//garnet/examples/escher/common",
"//garnet/public/lib/component/cpp",
"//garnet/public/lib/fsl",
"//garnet/public/lib/ui/scenic/cpp",
@@ -35,6 +34,7 @@
"//sdk/fidl/fuchsia.ui.gfx",
"//sdk/lib/fidl/cpp",
"//src/lib/fxl",
+ "//src/ui/examples/escher/common",
"//src/ui/lib/escher",
"//src/ui/lib/glm_workaround",
"//zircon/public/lib/fit",
diff --git a/garnet/packages/examples/BUILD.gn b/garnet/packages/examples/BUILD.gn
index 4f32511..a9864dc 100644
--- a/garnet/packages/examples/BUILD.gn
+++ b/garnet/packages/examples/BUILD.gn
@@ -55,7 +55,7 @@
group("escher") {
testonly = true
public_deps = [
- "//garnet/examples/escher:escher_waterfall",
+ "//src/ui/examples/escher:escher_waterfall",
]
}
diff --git a/garnet/examples/escher/BUILD.gn b/src/ui/examples/escher/BUILD.gn
similarity index 100%
rename from garnet/examples/escher/BUILD.gn
rename to src/ui/examples/escher/BUILD.gn
diff --git a/garnet/examples/escher/OWNERS b/src/ui/examples/escher/OWNERS
similarity index 61%
rename from garnet/examples/escher/OWNERS
rename to src/ui/examples/escher/OWNERS
index 575dd84..d242b71 100644
--- a/garnet/examples/escher/OWNERS
+++ b/src/ui/examples/escher/OWNERS
@@ -1,3 +1,3 @@
+adamgousetis@google.com
jjosh@google.com
mikejurka@google.com
-*
diff --git a/garnet/examples/escher/common/BUILD.gn b/src/ui/examples/escher/common/BUILD.gn
similarity index 100%
rename from garnet/examples/escher/common/BUILD.gn
rename to src/ui/examples/escher/common/BUILD.gn
diff --git a/garnet/examples/escher/common/demo.cc b/src/ui/examples/escher/common/demo.cc
similarity index 99%
rename from garnet/examples/escher/common/demo.cc
rename to src/ui/examples/escher/common/demo.cc
index 8db1d391..f2d9376 100644
--- a/garnet/examples/escher/common/demo.cc
+++ b/src/ui/examples/escher/common/demo.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "demo.h"
+#include "src/ui/examples/escher/common/demo.h"
#include <array>
#include <chrono>
diff --git a/garnet/examples/escher/common/demo.h b/src/ui/examples/escher/common/demo.h
similarity index 94%
rename from garnet/examples/escher/common/demo.h
rename to src/ui/examples/escher/common/demo.h
index 76268ca..b8ca336 100644
--- a/garnet/examples/escher/common/demo.h
+++ b/src/ui/examples/escher/common/demo.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_COMMON_DEMO_H_
-#define GARNET_EXAMPLES_ESCHER_COMMON_DEMO_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_H_
+#define SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_H_
-#include "garnet/examples/escher/common/demo_harness.h"
+#include "src/ui/examples/escher/common/demo_harness.h"
#include "src/ui/lib/escher/escher.h"
#include "src/ui/lib/escher/util/tracer.h"
#include "src/ui/lib/escher/vk/vulkan_context.h"
@@ -84,4 +84,4 @@
bool run_offscreen_benchmark_ = false;
};
-#endif // GARNET_EXAMPLES_ESCHER_COMMON_DEMO_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_H_
diff --git a/garnet/examples/escher/common/demo_harness.cc b/src/ui/examples/escher/common/demo_harness.cc
similarity index 98%
rename from garnet/examples/escher/common/demo_harness.cc
rename to src/ui/examples/escher/common/demo_harness.cc
index 15e8111..3fc725b 100644
--- a/garnet/examples/escher/common/demo_harness.cc
+++ b/src/ui/examples/escher/common/demo_harness.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/common/demo_harness.h"
+#include "src/ui/examples/escher/common/demo_harness.h"
-#include "garnet/examples/escher/common/demo.h"
+#include <iostream>
+#include <set>
+
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/memory/ref_ptr.h"
+#include "src/ui/examples/escher/common/demo.h"
#include "src/ui/lib/escher/escher_process_init.h"
#include "src/ui/lib/escher/vk/gpu_mem.h"
#include "src/ui/lib/escher/vk/image.h"
#include "src/ui/lib/escher/vk/vulkan_instance.h"
-#include "src/lib/fxl/logging.h"
-#include "src/lib/fxl/memory/ref_ptr.h"
-
-#include <iostream>
-#include <set>
#define VK_CHECK_RESULT(XXX) FXL_CHECK(XXX.result == vk::Result::eSuccess)
diff --git a/garnet/examples/escher/common/demo_harness.h b/src/ui/examples/escher/common/demo_harness.h
similarity index 96%
rename from garnet/examples/escher/common/demo_harness.h
rename to src/ui/examples/escher/common/demo_harness.h
index 42fc7d8..0097b5d 100644
--- a/garnet/examples/escher/common/demo_harness.h
+++ b/src/ui/examples/escher/common/demo_harness.h
@@ -2,11 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_H_
-#define GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_H_
+#define SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_H_
#include <cstdint>
-
#include <vulkan/vulkan.hpp>
#include "src/ui/lib/escher/fs/hack_filesystem.h"
@@ -160,4 +159,4 @@
bool shutdown_complete_ = false;
};
-#endif // GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_H_
diff --git a/garnet/examples/escher/common/demo_harness_fuchsia.cc b/src/ui/examples/escher/common/demo_harness_fuchsia.cc
similarity index 97%
rename from garnet/examples/escher/common/demo_harness_fuchsia.cc
rename to src/ui/examples/escher/common/demo_harness_fuchsia.cc
index b0b3df4..f0b4155 100644
--- a/garnet/examples/escher/common/demo_harness_fuchsia.cc
+++ b/src/ui/examples/escher/common/demo_harness_fuchsia.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/common/demo_harness_fuchsia.h"
+#include "src/ui/examples/escher/common/demo_harness_fuchsia.h"
#include <hid/usages.h>
#include <lib/async/cpp/task.h>
@@ -11,9 +11,9 @@
#include <memory>
-#include "garnet/examples/escher/common/demo.h"
-#include "src/ui/lib/escher/util/trace_macros.h"
#include "lib/vfs/cpp/pseudo_dir.h"
+#include "src/ui/examples/escher/common/demo.h"
+#include "src/ui/lib/escher/util/trace_macros.h"
namespace {
diff --git a/garnet/examples/escher/common/demo_harness_fuchsia.h b/src/ui/examples/escher/common/demo_harness_fuchsia.h
similarity index 88%
rename from garnet/examples/escher/common/demo_harness_fuchsia.h
rename to src/ui/examples/escher/common/demo_harness_fuchsia.h
index 72d600d..8abefed 100644
--- a/garnet/examples/escher/common/demo_harness_fuchsia.h
+++ b/src/ui/examples/escher/common/demo_harness_fuchsia.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_FUCHSIA_H_
-#define GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_FUCHSIA_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_FUCHSIA_H_
+#define SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_FUCHSIA_H_
#include <lib/async-loop/cpp/loop.h>
#include <lib/fidl/cpp/binding_set.h>
@@ -13,7 +13,7 @@
#include <memory>
#include "garnet/bin/ui/input_reader/input_reader.h"
-#include "garnet/examples/escher/common/demo_harness.h"
+#include "src/ui/examples/escher/common/demo_harness.h"
class DemoHarnessFuchsia : public DemoHarness,
fuchsia::ui::input::InputDeviceRegistry {
@@ -65,4 +65,4 @@
input_devices_;
};
-#endif // GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_FUCHSIA_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_FUCHSIA_H_
diff --git a/garnet/examples/escher/common/demo_harness_linux.cc b/src/ui/examples/escher/common/demo_harness_linux.cc
similarity index 97%
rename from garnet/examples/escher/common/demo_harness_linux.cc
rename to src/ui/examples/escher/common/demo_harness_linux.cc
index ba0e594..7655eeb 100644
--- a/garnet/examples/escher/common/demo_harness_linux.cc
+++ b/src/ui/examples/escher/common/demo_harness_linux.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/common/demo_harness_linux.h"
+#include "src/ui/examples/escher/common/demo_harness_linux.h"
+
+#include <GLFW/glfw3.h>
#include <chrono>
#include <thread>
-#include <GLFW/glfw3.h>
-
-#include "garnet/examples/escher/common/demo.h"
-#include "src/ui/lib/escher/util/trace_macros.h"
#include "src/lib/fxl/logging.h"
+#include "src/ui/examples/escher/common/demo.h"
+#include "src/ui/lib/escher/util/trace_macros.h"
static DemoHarness* g_harness = nullptr;
static GLFWwindow* g_window;
@@ -187,8 +187,7 @@
}
void DemoHarnessLinux::AppendPlatformSpecificDeviceExtensionNames(
- std::set<std::string>* names) {
-}
+ std::set<std::string>* names) {}
void DemoHarnessLinux::ShutdownWindowSystem() {
FXL_CHECK(g_harness);
diff --git a/garnet/examples/escher/common/demo_harness_linux.h b/src/ui/examples/escher/common/demo_harness_linux.h
similarity index 77%
rename from garnet/examples/escher/common/demo_harness_linux.h
rename to src/ui/examples/escher/common/demo_harness_linux.h
index d474e88..4b00538a 100644
--- a/garnet/examples/escher/common/demo_harness_linux.h
+++ b/src/ui/examples/escher/common/demo_harness_linux.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_LINUX_H_
-#define GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_LINUX_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_LINUX_H_
+#define SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_LINUX_H_
-#include "garnet/examples/escher/common/demo_harness.h"
+#include "src/ui/examples/escher/common/demo_harness.h"
class DemoHarnessLinux : public DemoHarness {
public:
@@ -27,9 +27,8 @@
void AppendPlatformSpecificDeviceExtensionNames(
std::set<std::string>* names) override;
-
// Called by Shutdown().
void ShutdownWindowSystem() override;
};
-#endif // GARNET_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_LINUX_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_COMMON_DEMO_HARNESS_LINUX_H_
diff --git a/garnet/examples/escher/meta/escher_examples.cmx b/src/ui/examples/escher/meta/escher_examples.cmx
similarity index 100%
rename from garnet/examples/escher/meta/escher_examples.cmx
rename to src/ui/examples/escher/meta/escher_examples.cmx
diff --git a/garnet/examples/escher/waterfall/BUILD.gn b/src/ui/examples/escher/waterfall/BUILD.gn
similarity index 90%
rename from garnet/examples/escher/waterfall/BUILD.gn
rename to src/ui/examples/escher/waterfall/BUILD.gn
index be3ea3f..7cac1a9 100644
--- a/garnet/examples/escher/waterfall/BUILD.gn
+++ b/src/ui/examples/escher/waterfall/BUILD.gn
@@ -11,7 +11,7 @@
deps = [
":scenes",
- "//garnet/examples/escher/common",
+ "//src/ui/examples/escher/common",
"//src/ui/lib/escher:vulkan",
]
@@ -37,6 +37,6 @@
]
deps = [
- "//garnet/examples/escher/common",
+ "//src/ui/examples/escher/common",
]
}
diff --git a/garnet/examples/escher/waterfall/scenes/app_test_scene.cc b/src/ui/examples/escher/waterfall/scenes/app_test_scene.cc
similarity index 98%
rename from garnet/examples/escher/waterfall/scenes/app_test_scene.cc
rename to src/ui/examples/escher/waterfall/scenes/app_test_scene.cc
index 11ed5a1..f593c02 100644
--- a/garnet/examples/escher/waterfall/scenes/app_test_scene.cc
+++ b/src/ui/examples/escher/waterfall/scenes/app_test_scene.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/waterfall/scenes/app_test_scene.h"
+#include "src/ui/examples/escher/waterfall/scenes/app_test_scene.h"
+#include "src/lib/fxl/arraysize.h"
#include "src/ui/lib/escher/geometry/tessellation.h"
#include "src/ui/lib/escher/gl/gles2/bindings.h"
#include "src/ui/lib/escher/renderer.h"
-#include "src/lib/fxl/arraysize.h"
using namespace escher;
diff --git a/garnet/examples/escher/waterfall/scenes/app_test_scene.h b/src/ui/examples/escher/waterfall/scenes/app_test_scene.h
similarity index 100%
rename from garnet/examples/escher/waterfall/scenes/app_test_scene.h
rename to src/ui/examples/escher/waterfall/scenes/app_test_scene.h
diff --git a/garnet/examples/escher/waterfall/scenes/demo_scene.cc b/src/ui/examples/escher/waterfall/scenes/demo_scene.cc
similarity index 96%
rename from garnet/examples/escher/waterfall/scenes/demo_scene.cc
rename to src/ui/examples/escher/waterfall/scenes/demo_scene.cc
index 0a573321f..bafdc1d 100644
--- a/garnet/examples/escher/waterfall/scenes/demo_scene.cc
+++ b/src/ui/examples/escher/waterfall/scenes/demo_scene.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/waterfall/scenes/demo_scene.h"
+#include "src/ui/examples/escher/waterfall/scenes/demo_scene.h"
#include "src/ui/lib/escher/geometry/tessellation.h"
#include "src/ui/lib/escher/geometry/transform.h"
diff --git a/garnet/examples/escher/waterfall/scenes/demo_scene.h b/src/ui/examples/escher/waterfall/scenes/demo_scene.h
similarity index 72%
rename from garnet/examples/escher/waterfall/scenes/demo_scene.h
rename to src/ui/examples/escher/waterfall/scenes/demo_scene.h
index 3ef922fb2..dd821cc 100644
--- a/garnet/examples/escher/waterfall/scenes/demo_scene.h
+++ b/src/ui/examples/escher/waterfall/scenes/demo_scene.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_DEMO_SCENE_H_
-#define GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_DEMO_SCENE_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_DEMO_SCENE_H_
+#define SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_DEMO_SCENE_H_
-#include "garnet/examples/escher/waterfall/scenes/scene.h"
+#include "src/ui/examples/escher/waterfall/scenes/scene.h"
#include "src/ui/lib/escher/escher.h"
class DemoScene : public Scene {
@@ -27,4 +27,4 @@
FXL_DISALLOW_COPY_AND_ASSIGN(DemoScene);
};
-#endif // GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_DEMO_SCENE_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_DEMO_SCENE_H_
diff --git a/garnet/examples/escher/waterfall/scenes/paper_demo_scene1.cc b/src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.cc
similarity index 99%
rename from garnet/examples/escher/waterfall/scenes/paper_demo_scene1.cc
rename to src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.cc
index b07fd3a..15c0712e 100644
--- a/garnet/examples/escher/waterfall/scenes/paper_demo_scene1.cc
+++ b/src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h"
+#include "src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.h"
#include "src/ui/lib/escher/geometry/plane_ops.h"
#include "src/ui/lib/escher/geometry/tessellation.h"
diff --git a/garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h b/src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.h
similarity index 90%
rename from garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h
rename to src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.h
index 3c6a9db..f082d3a 100644
--- a/garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h
+++ b/src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.h
@@ -2,15 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_PAPER_DEMO_SCENE1_H_
-#define GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_PAPER_DEMO_SCENE1_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_PAPER_DEMO_SCENE1_H_
+#define SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_PAPER_DEMO_SCENE1_H_
+#include "src/ui/examples/escher/waterfall/scenes/scene.h"
#include "src/ui/lib/escher/escher.h"
#include "src/ui/lib/escher/paper/paper_shape_cache.h"
#include "src/ui/lib/escher/shape/rounded_rect_factory.h"
-#include "garnet/examples/escher/waterfall/scenes/scene.h"
-
// Demo scene specifically designed to exercise the new PaperRenderer components
// (e.g. PaperShapeCache and PaperRenderQueue).
class PaperDemoScene1 : public Scene {
@@ -84,4 +83,4 @@
FXL_DISALLOW_COPY_AND_ASSIGN(PaperDemoScene1);
};
-#endif // GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_PAPER_DEMO_SCENE1_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_PAPER_DEMO_SCENE1_H_
diff --git a/garnet/examples/escher/waterfall/scenes/scene.cc b/src/ui/examples/escher/waterfall/scenes/scene.cc
similarity index 87%
rename from garnet/examples/escher/waterfall/scenes/scene.cc
rename to src/ui/examples/escher/waterfall/scenes/scene.cc
index 8ab7d68..33a0f1e 100644
--- a/garnet/examples/escher/waterfall/scenes/scene.cc
+++ b/src/ui/examples/escher/waterfall/scenes/scene.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/waterfall/scenes/scene.h"
+#include "src/ui/examples/escher/waterfall/scenes/scene.h"
#include "src/ui/lib/escher/paper/paper_scene.h"
#include "src/ui/lib/escher/scene/model.h"
@@ -23,8 +23,7 @@
}
void Scene::Update(const escher::Stopwatch& stopwatch, uint64_t frame_count,
- escher::PaperScene* scene,
- escher::PaperRenderer* renderer) {
+ escher::PaperScene* scene, escher::PaperRenderer* renderer) {
const auto& box = scene->bounding_box;
FXL_DCHECK(!box.is_empty());
diff --git a/garnet/examples/escher/waterfall/scenes/scene.h b/src/ui/examples/escher/waterfall/scenes/scene.h
similarity index 92%
rename from garnet/examples/escher/waterfall/scenes/scene.h
rename to src/ui/examples/escher/waterfall/scenes/scene.h
index 5ed976b..8e9afcc 100644
--- a/garnet/examples/escher/waterfall/scenes/scene.h
+++ b/src/ui/examples/escher/waterfall/scenes/scene.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_SCENE_H_
-#define GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_SCENE_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_SCENE_H_
+#define SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_SCENE_H_
-#include "garnet/examples/escher/common/demo.h"
+#include "src/ui/examples/escher/common/demo.h"
#include "src/ui/lib/escher/escher.h"
#include "src/ui/lib/escher/paper/paper_renderer.h"
@@ -70,4 +70,4 @@
FXL_DISALLOW_COPY_AND_ASSIGN(Scene);
};
-#endif // GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_SCENE_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_SCENE_H_
diff --git a/garnet/examples/escher/waterfall/scenes/shadow_test_scene.cc b/src/ui/examples/escher/waterfall/scenes/shadow_test_scene.cc
similarity index 95%
rename from garnet/examples/escher/waterfall/scenes/shadow_test_scene.cc
rename to src/ui/examples/escher/waterfall/scenes/shadow_test_scene.cc
index 42194d4..e5d6bf5f 100644
--- a/garnet/examples/escher/waterfall/scenes/shadow_test_scene.cc
+++ b/src/ui/examples/escher/waterfall/scenes/shadow_test_scene.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/waterfall/scenes/shadow_test_scene.h"
+#include "src/ui/examples/escher/waterfall/scenes/shadow_test_scene.h"
-#include "src/ui/lib/escher/renderer.h"
#include "src/lib/fxl/arraysize.h"
+#include "src/ui/lib/escher/renderer.h"
using namespace escher;
diff --git a/garnet/examples/escher/waterfall/scenes/shadow_test_scene.h b/src/ui/examples/escher/waterfall/scenes/shadow_test_scene.h
similarity index 74%
rename from garnet/examples/escher/waterfall/scenes/shadow_test_scene.h
rename to src/ui/examples/escher/waterfall/scenes/shadow_test_scene.h
index 8d57158..de78463 100644
--- a/garnet/examples/escher/waterfall/scenes/shadow_test_scene.h
+++ b/src/ui/examples/escher/waterfall/scenes/shadow_test_scene.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_SHADOW_TEST_SCENE_H_
-#define GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_SHADOW_TEST_SCENE_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_SHADOW_TEST_SCENE_H_
+#define SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_SHADOW_TEST_SCENE_H_
+#include "src/lib/fxl/macros.h"
#include "src/ui/lib/escher/scene/model.h"
#include "src/ui/lib/escher/scene/viewing_volume.h"
-#include "src/lib/fxl/macros.h"
class ShadowTestScene {
public:
@@ -22,4 +22,4 @@
FXL_DISALLOW_COPY_AND_ASSIGN(ShadowTestScene);
};
-#endif // GARNET_EXAMPLES_ESCHER_WATERFALL_SCENES_SHADOW_TEST_SCENE_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_WATERFALL_SCENES_SHADOW_TEST_SCENE_H_
diff --git a/garnet/examples/escher/waterfall/waterfall_demo.cc b/src/ui/examples/escher/waterfall/waterfall_demo.cc
similarity index 98%
rename from garnet/examples/escher/waterfall/waterfall_demo.cc
rename to src/ui/examples/escher/waterfall/waterfall_demo.cc
index 622ce9b..7b22567 100644
--- a/garnet/examples/escher/waterfall/waterfall_demo.cc
+++ b/src/ui/examples/escher/waterfall/waterfall_demo.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "garnet/examples/escher/waterfall/waterfall_demo.h"
+#include "src/ui/examples/escher/waterfall/waterfall_demo.h"
-#include "garnet/examples/escher/waterfall/scenes/paper_demo_scene1.h"
+#include "src/ui/examples/escher/waterfall/scenes/paper_demo_scene1.h"
#include "src/ui/lib/escher/defaults/default_shader_program_factory.h"
#include "src/ui/lib/escher/geometry/tessellation.h"
#include "src/ui/lib/escher/paper/paper_scene.h"
diff --git a/garnet/examples/escher/waterfall/waterfall_demo.h b/src/ui/examples/escher/waterfall/waterfall_demo.h
similarity index 85%
rename from garnet/examples/escher/waterfall/waterfall_demo.h
rename to src/ui/examples/escher/waterfall/waterfall_demo.h
index 045d0ec..7d6c6a5 100644
--- a/garnet/examples/escher/waterfall/waterfall_demo.h
+++ b/src/ui/examples/escher/waterfall/waterfall_demo.h
@@ -2,23 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef GARNET_EXAMPLES_ESCHER_WATERFALL_WATERFALL_DEMO_H_
-#define GARNET_EXAMPLES_ESCHER_WATERFALL_WATERFALL_DEMO_H_
+#ifndef SRC_UI_EXAMPLES_ESCHER_WATERFALL_WATERFALL_DEMO_H_
+#define SRC_UI_EXAMPLES_ESCHER_WATERFALL_WATERFALL_DEMO_H_
#include <stdlib.h>
+
#include <cmath>
#include <iostream>
-#include "garnet/examples/escher/common/demo.h"
-#include "garnet/examples/escher/common/demo_harness.h"
-#include "garnet/examples/escher/waterfall/scenes/scene.h"
-
+#include "src/lib/fxl/logging.h"
+#include "src/ui/examples/escher/common/demo.h"
+#include "src/ui/examples/escher/common/demo_harness.h"
+#include "src/ui/examples/escher/waterfall/scenes/scene.h"
#include "src/ui/lib/escher/escher.h"
#include "src/ui/lib/escher/forward_declarations.h"
#include "src/ui/lib/escher/fs/hack_filesystem.h"
#include "src/ui/lib/escher/paper/paper_renderer.h"
#include "src/ui/lib/escher/util/stopwatch.h"
-#include "src/lib/fxl/logging.h"
class WaterfallDemo : public Demo {
public:
@@ -75,4 +75,4 @@
bool show_debug_info_ = false;
};
-#endif // GARNET_EXAMPLES_ESCHER_WATERFALL_WATERFALL_DEMO_H_
+#endif // SRC_UI_EXAMPLES_ESCHER_WATERFALL_WATERFALL_DEMO_H_
diff --git a/garnet/examples/escher/waterfall/waterfall_main.cc b/src/ui/examples/escher/waterfall/waterfall_main.cc
similarity index 90%
rename from garnet/examples/escher/waterfall/waterfall_main.cc
rename to src/ui/examples/escher/waterfall/waterfall_main.cc
index db92715..a64d7c8 100644
--- a/garnet/examples/escher/waterfall/waterfall_main.cc
+++ b/src/ui/examples/escher/waterfall/waterfall_main.cc
@@ -3,10 +3,11 @@
// found in the LICENSE file.
#include <stdlib.h>
+
#include <cmath>
-#include "garnet/examples/escher/common/demo_harness.h"
-#include "garnet/examples/escher/waterfall/waterfall_demo.h"
+#include "src/ui/examples/escher/common/demo_harness.h"
+#include "src/ui/examples/escher/waterfall/waterfall_demo.h"
std::unique_ptr<DemoHarness> CreateHarnessDemo(std::string demo_name,
uint32_t width, uint32_t height,
diff --git a/src/ui/lib/escher/build_linux/BUILD.gn b/src/ui/lib/escher/build_linux/BUILD.gn
index a4472f3..e85fa63 100644
--- a/src/ui/lib/escher/build_linux/BUILD.gn
+++ b/src/ui/lib/escher/build_linux/BUILD.gn
@@ -8,7 +8,7 @@
group("examples") {
deps = [
- "//garnet/examples/escher/waterfall($host_toolchain)",
+ "//src/ui/examples/escher/waterfall($host_toolchain)",
]
}
diff --git a/src/ui/lib/escher/test/BUILD.gn b/src/ui/lib/escher/test/BUILD.gn
index 3efdab3..94e50d0 100644
--- a/src/ui/lib/escher/test/BUILD.gn
+++ b/src/ui/lib/escher/test/BUILD.gn
@@ -162,7 +162,7 @@
group("force_waterfall_to_build_on_host") {
if (is_linux) {
deps = [
- "//garnet/examples/escher/waterfall($host_toolchain)",
+ "//src/ui/examples/escher/waterfall($host_toolchain)",
]
}
}
