Convert vkcube to use .cmx shard
Including this shard helps ensure all applications provide the correct
set of services to the Vulkan driver.
Bug: 64508
Change-Id: I7ee234ee82a39fc790e1aaffab6c3dce2f15e1eb
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/Vulkan-Tools/+/458397
Reviewed-by: Craig Stout <cstout@google.com>
diff --git a/cube/fuchsia/meta/vkcube-on-fb.cmx b/cube/fuchsia/meta/vkcube-on-fb.cmx
index 8e9fe3c..87a9ce9 100644
--- a/cube/fuchsia/meta/vkcube-on-fb.cmx
+++ b/cube/fuchsia/meta/vkcube-on-fb.cmx
@@ -1,19 +1,14 @@
{
+ "include": [
+ "sdk/lib/diagnostics/syslog/client.shard.cmx",
+ "src/lib/vulkan/application.shard.cmx"
+ ],
"program": {
"binary": "bin/vkcube-on-fb"
},
"sandbox": {
"dev": [
"class/display-controller"
- ],
- "features": [
- "vulkan"
- ],
- "services": [
- "fuchsia.logger.LogSink",
- "fuchsia.sysmem.Allocator",
- "fuchsia.tracing.provider.Registry",
- "fuchsia.vulkan.loader.Loader"
]
}
}
diff --git a/cube/fuchsia/meta/vkcube-on-scenic.cmx b/cube/fuchsia/meta/vkcube-on-scenic.cmx
index ff2ab81..7f80377 100644
--- a/cube/fuchsia/meta/vkcube-on-scenic.cmx
+++ b/cube/fuchsia/meta/vkcube-on-scenic.cmx
@@ -1,19 +1,9 @@
{
"include": [
- "sdk/lib/diagnostics/syslog/client.shard.cmx"
+ "sdk/lib/diagnostics/syslog/client.shard.cmx",
+ "src/lib/vulkan/application.shard.cmx"
],
"program": {
"binary": "bin/vkcube-on-scenic"
- },
- "sandbox": {
- "features": [
- "vulkan"
- ],
- "services": [
- "fuchsia.sysmem.Allocator",
- "fuchsia.tracing.provider.Registry",
- "fuchsia.ui.scenic.Scenic",
- "fuchsia.vulkan.loader.Loader"
- ]
}
}
diff --git a/cube/fuchsia/meta/vkcube-skip-present.cmx b/cube/fuchsia/meta/vkcube-skip-present.cmx
index bf9723c..0df3fd9 100644
--- a/cube/fuchsia/meta/vkcube-skip-present.cmx
+++ b/cube/fuchsia/meta/vkcube-skip-present.cmx
@@ -1,19 +1,14 @@
{
+ "include": [
+ "sdk/lib/diagnostics/syslog/client.shard.cmx",
+ "src/lib/vulkan/application.shard.cmx"
+ ],
"program": {
"binary": "bin/vkcube-skip-present"
},
"sandbox": {
"dev": [
"class/display-controller"
- ],
- "features": [
- "vulkan"
- ],
- "services": [
- "fuchsia.logger.LogSink",
- "fuchsia.sysmem.Allocator",
- "fuchsia.tracing.provider.Registry",
- "fuchsia.vulkan.loader.Loader"
]
}
}
