build: Move fushcia source files into loader directory

Mainly cosmetic to have 1 less top level directory

diff --git a/BUILD.gn b/BUILD.gn
index 760356b57908007bc0999096fb022c1d5647d652..bc7814a120f0416e5bdf319e2d0c7621a950a3ba 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -221,16 +221,10 @@ if (!is_android) {
 }
 
 if (is_fuchsia) {
-  config("fuchsia_config") {
-    include_dirs = [ "fuchsia" ]
-  }
-
   source_set("dlopen_fuchsia") {
-    public_configs = [ ":fuchsia_config" ]
-
     sources = [
-      "fuchsia/dlopen_fuchsia.c",
-      "fuchsia/dlopen_fuchsia.h",
+      "loader/dlopen_fuchsia.c",
+      "loader/dlopen_fuchsia.h",
     ]
 
     deps = [

diff --git a/fuchsia/dlopen_fuchsia.c b/fuchsia/dlopen_fuchsia.c
deleted file mode 100644 (file)
index c973b35..0000000
--- a/fuchsia/dlopen_fuchsia.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *
- * Copyright (c) 2018 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "dlopen_fuchsia.h"
-
-#include <fcntl.h>
-#include <fuchsia/vulkan/loader/c/fidl.h>
-#include <lib/fdio/io.h>
-#include <lib/fdio/directory.h>
-#include <stdio.h>
-#include <string.h>
-#include <threads.h>
-#include <zircon/dlfcn.h>
-#include <zircon/syscalls.h>
-
-static char g_error[128] = {};
-
-const char *dlerror_fuchsia(void) { return g_error; }
-
-static zx_handle_t vulkan_loader_svc = ZX_HANDLE_INVALID;
-void connect_to_vulkan_loader_svc(void) {
-    zx_handle_t svc1, svc2;
-    if (zx_channel_create(0, &svc1, &svc2) != ZX_OK) return;
-
-    if (fdio_service_connect("/svc/" fuchsia_vulkan_loader_Loader_Name, svc1) != ZX_OK) {
-        zx_handle_close(svc2);
-        return;
-    }
-
-    vulkan_loader_svc = svc2;
-}
-
-static once_flag svc_connect_once_flag = ONCE_FLAG_INIT;
-
-void *dlopen_fuchsia(const char *name, int mode, bool driver) {
-    // First try to just dlopen() from our own namespace. This will succeed for
-    // any layers that are packaged with the application, but will fail for
-    // client drivers loaded from the system.
-    void *result;
-    if (!driver) {
-        result = dlopen(name, mode);
-        if (result != NULL) return result;
-    }
-
-    // If we couldn't find the library in our own namespace, connect to the
-    // loader service to request this library.
-    call_once(&svc_connect_once_flag, connect_to_vulkan_loader_svc);
-
-    if (vulkan_loader_svc == ZX_HANDLE_INVALID) {
-        snprintf(g_error, sizeof(g_error), "libvulkan.so:dlopen_fuchsia: no connection to loader svc\n");
-        return NULL;
-    }
-
-    zx_handle_t vmo = ZX_HANDLE_INVALID;
-    zx_status_t st = fuchsia_vulkan_loader_LoaderGet(vulkan_loader_svc, name, strlen(name), &vmo);
-    if (st != ZX_OK) {
-        snprintf(g_error, sizeof(g_error), "libvulkan.so:dlopen_fuchsia: Get() failed: %d\n", st);
-        return NULL;
-    }
-
-    if (vmo == ZX_HANDLE_INVALID) {
-        snprintf(g_error, sizeof(g_error), "libvulkan.so:dlopen_fuchsia: Get() returned invalid vmo\n");
-        return NULL;
-    }
-
-    result = dlopen_vmo(vmo, mode);
-    zx_handle_close(vmo);
-    if (!result) {
-        snprintf(g_error, sizeof(g_error), "%s", dlerror());
-    }
-    return result;
-}

diff --git a/fuchsia/dlopen_fuchsia.h b/fuchsia/dlopen_fuchsia.h
deleted file mode 100644 (file)
index a674b8d..0000000
--- a/fuchsia/dlopen_fuchsia.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Copyright (c) 2018 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-#pragma once
-
-#include <zircon/compiler.h>
-#include <stdbool.h>
-
-__BEGIN_CDECLS
-
-// If not |driver|, then the request is to load a layer.
-void *dlopen_fuchsia(const char *name, int mode, bool driver);
-const char *dlerror_fuchsia(void);
-
-__END_CDECLS

diff --git a/loader/dlopen_fuchsia.c b/loader/dlopen_fuchsia.c
new file mode 100644 (file)
index 0000000..c973b35
--- /dev/null
+++ b/loader/dlopen_fuchsia.c
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright (c) 2018 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "dlopen_fuchsia.h"
+
+#include <fcntl.h>
+#include <fuchsia/vulkan/loader/c/fidl.h>
+#include <lib/fdio/io.h>
+#include <lib/fdio/directory.h>
+#include <stdio.h>
+#include <string.h>
+#include <threads.h>
+#include <zircon/dlfcn.h>
+#include <zircon/syscalls.h>
+
+static char g_error[128] = {};
+
+const char *dlerror_fuchsia(void) { return g_error; }
+
+static zx_handle_t vulkan_loader_svc = ZX_HANDLE_INVALID;
+void connect_to_vulkan_loader_svc(void) {
+    zx_handle_t svc1, svc2;
+    if (zx_channel_create(0, &svc1, &svc2) != ZX_OK) return;
+
+    if (fdio_service_connect("/svc/" fuchsia_vulkan_loader_Loader_Name, svc1) != ZX_OK) {
+        zx_handle_close(svc2);
+        return;
+    }
+
+    vulkan_loader_svc = svc2;
+}
+
+static once_flag svc_connect_once_flag = ONCE_FLAG_INIT;
+
+void *dlopen_fuchsia(const char *name, int mode, bool driver) {
+    // First try to just dlopen() from our own namespace. This will succeed for
+    // any layers that are packaged with the application, but will fail for
+    // client drivers loaded from the system.
+    void *result;
+    if (!driver) {
+        result = dlopen(name, mode);
+        if (result != NULL) return result;
+    }
+
+    // If we couldn't find the library in our own namespace, connect to the
+    // loader service to request this library.
+    call_once(&svc_connect_once_flag, connect_to_vulkan_loader_svc);
+
+    if (vulkan_loader_svc == ZX_HANDLE_INVALID) {
+        snprintf(g_error, sizeof(g_error), "libvulkan.so:dlopen_fuchsia: no connection to loader svc\n");
+        return NULL;
+    }
+
+    zx_handle_t vmo = ZX_HANDLE_INVALID;
+    zx_status_t st = fuchsia_vulkan_loader_LoaderGet(vulkan_loader_svc, name, strlen(name), &vmo);
+    if (st != ZX_OK) {
+        snprintf(g_error, sizeof(g_error), "libvulkan.so:dlopen_fuchsia: Get() failed: %d\n", st);
+        return NULL;
+    }
+
+    if (vmo == ZX_HANDLE_INVALID) {
+        snprintf(g_error, sizeof(g_error), "libvulkan.so:dlopen_fuchsia: Get() returned invalid vmo\n");
+        return NULL;
+    }
+
+    result = dlopen_vmo(vmo, mode);
+    zx_handle_close(vmo);
+    if (!result) {
+        snprintf(g_error, sizeof(g_error), "%s", dlerror());
+    }
+    return result;
+}

diff --git a/loader/dlopen_fuchsia.h b/loader/dlopen_fuchsia.h
new file mode 100644 (file)
index 0000000..a674b8d
--- /dev/null
+++ b/loader/dlopen_fuchsia.h
@@ -0,0 +1,29 @@
+/*
+ *
+ * Copyright (c) 2018 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+#pragma once
+
+#include <zircon/compiler.h>
+#include <stdbool.h>
+
+__BEGIN_CDECLS
+
+// If not |driver|, then the request is to load a layer.
+void *dlopen_fuchsia(const char *name, int mode, bool driver);
+const char *dlerror_fuchsia(void);
+
+__END_CDECLS