[graphics] Fix loader API flag checking

The loaders were incorrectly checking IcdFlags, so the Vulkan loader was
attempting to load OpenCL ICDs and the OpenCL loader was attempting to
load Vulkan ICDs.

Change-Id: Id925e309bc1f43e788825e464b917886b0a7d479
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/638634
Fuchsia-Auto-Submit: John Bauman <[email protected]>
Reviewed-by: Jamie Howarth <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: John Bauman

src/graphics/bin/opencl_loader/app.h

@@ -81,6 +81,7 @@ class LoaderApp {
   std::optional<zx::vmo> GetMatchingIcd(const std::string& system_lib_name);
 
   size_t device_count() const { return devices_.size(); }
+  const std::vector<std::unique_ptr<GpuDevice>>& devices() const { return devices_; }
 
   async_dispatcher_t* fdio_loop_dispatcher() { return fdio_loop_.dispatcher(); }
 

src/graphics/bin/opencl_loader/icd_list.h

@@ -26,6 +26,8 @@ class IcdList {
   // Finds an ICD in the list with a `library_path` matching this string.
   std::optional<zx::vmo> GetVmoMatchingSystemLib(const std::string& library_path) const;
 
+  size_t ComponentCount() const { return components_.size(); }
+
  private:
   inspect::StringProperty active_icd_;
   std::vector<std::shared_ptr<IcdComponent>> components_;

src/graphics/bin/opencl_loader/magma_device.cc

@@ -68,7 +68,7 @@ bool MagmaDevice::Initialize(int dir_fd, const std::string& name, inspect::Node*
       data.node = node().CreateChild(std::to_string(i++));
       data.node.CreateString("component_url", icd.component_url(), &data.values);
       data.node.CreateUint("flags", static_cast<uint32_t>(icd.flags()), &data.values);
-      if (icd.flags().SUPPORTS_OPENCL) {
+      if (icd.flags() & fuchsia::gpu::magma::IcdFlags::SUPPORTS_OPENCL) {
         icd_list_.Add(app()->CreateIcdComponent(icd.component_url()));
       }
 

src/graphics/bin/opencl_loader/test/unittest.cc

@@ -42,6 +42,9 @@ class FakeMagmaDevice : public fuchsia::gpu::magma::testing::Device_TestBase {
     info.set_flags(fuchsia::gpu::magma::IcdFlags::SUPPORTS_OPENCL);
     std::vector<fuchsia::gpu::magma::IcdInfo> vec;
     vec.push_back(std::move(info));
+    info.set_component_url("b");
+    info.set_flags(fuchsia::gpu::magma::IcdFlags::SUPPORTS_VULKAN);
+    vec.push_back(std::move(info));
     callback(std::move(vec));
   }
   fidl::InterfaceRequestHandler<fuchsia::gpu::magma::Device> GetHandler() {
@@ -80,6 +83,9 @@ TEST_F(LoaderUnittest, MagmaDevice) {
   RunLoopUntil([&device_ptr]() { return device_ptr->icd_count() > 0; });
   EXPECT_EQ(1u, app.device_count());
 
+  // Only 1 ICD listed supports OpenCL.
+  EXPECT_EQ(1u, static_cast<MagmaDevice*>(app.devices()[0].get())->icd_list().ComponentCount());
+
   async::PostTask(vfs_loop.dispatcher(), [&magma_device]() { magma_device.CloseAll(); });
   RunLoopUntil([&app]() { return app.device_count() == 0; });
   EXPECT_EQ(0u, app.device_count());

src/graphics/bin/vulkan_loader/app.h

@@ -81,6 +81,7 @@ class LoaderApp {
   std::optional<zx::vmo> GetMatchingIcd(const std::string& system_lib_name);
 
   size_t device_count() const { return devices_.size(); }
+  const std::vector<std::unique_ptr<GpuDevice>>& devices() const { return devices_; }
 
   async_dispatcher_t* fdio_loop_dispatcher() { return fdio_loop_.dispatcher(); }
 

src/graphics/bin/vulkan_loader/icd_list.h

@@ -26,6 +26,8 @@ class IcdList {
   // Finds an ICD in the list with a `library_path` matching this string.
   std::optional<zx::vmo> GetVmoMatchingSystemLib(const std::string& library_path) const;
 
+  size_t ComponentCount() const { return components_.size(); }
+
  private:
   inspect::StringProperty active_icd_;
   std::vector<std::shared_ptr<IcdComponent>> components_;

src/graphics/bin/vulkan_loader/magma_device.cc

@@ -68,7 +68,7 @@ bool MagmaDevice::Initialize(int dir_fd, std::string name, inspect::Node* parent
       data.node = node().CreateChild(std::to_string(i++));
       data.node.CreateString("component_url", icd.component_url(), &data.values);
       data.node.CreateUint("flags", static_cast<uint32_t>(icd.flags()), &data.values);
-      if (icd.flags().SUPPORTS_VULKAN) {
+      if (icd.flags() & fuchsia::gpu::magma::IcdFlags::SUPPORTS_VULKAN) {
         icd_list_.Add(app()->CreateIcdComponent(icd.component_url()));
       }
 

src/graphics/bin/vulkan_loader/test/unittest.cc

@@ -44,6 +44,9 @@ class FakeMagmaDevice : public fuchsia::gpu::magma::testing::Device_TestBase {
     info.set_flags(fuchsia::gpu::magma::IcdFlags::SUPPORTS_VULKAN);
     std::vector<fuchsia::gpu::magma::IcdInfo> vec;
     vec.push_back(std::move(info));
+    info.set_component_url("b");
+    info.set_flags(fuchsia::gpu::magma::IcdFlags::SUPPORTS_OPENCL);
+    vec.push_back(std::move(info));
     callback(std::move(vec));
   }
   fidl::InterfaceRequestHandler<fuchsia::gpu::magma::Device> GetHandler() {
@@ -82,6 +85,9 @@ TEST_F(LoaderUnittest, MagmaDevice) {
   RunLoopUntil([&device_ptr]() { return device_ptr->icd_count() > 0; });
   EXPECT_EQ(1u, app.device_count());
 
+  // Only 1 ICD listed supports Vulkan.
+  EXPECT_EQ(1u, static_cast<MagmaDevice*>(app.devices()[0].get())->icd_list().ComponentCount());
+
   async::PostTask(vfs_loop.dispatcher(), [&magma_device]() { magma_device.CloseAll(); });
   RunLoopUntil([&app]() { return app.device_count() == 0; });
   EXPECT_EQ(0u, app.device_count());