[SYCL][Bindless] Compile on Windows

* Added missing `__SYCL_EXPORT`
* Use fixed width `pi_uint64` instead of `unsigned long`
* Added missing headers and forward declarations

Author: ProGTX

sycl/include/sycl/ext/oneapi/bindless_images.hpp

@@ -22,12 +22,12 @@ namespace oneapi {
 namespace experimental {
 /// Opaque unsampled image handle type.
 struct unsampled_image_handle {
-  using raw_handle_type = unsigned long;
+  using raw_handle_type = pi_uint64;
   raw_handle_type raw_handle;
 };
 /// Opaque sampled image handle type.
 struct sampled_image_handle {
-  using raw_handle_type = unsigned long;
+  using raw_handle_type = pi_uint64;
   raw_handle_type raw_handle;
 };
 
@@ -530,9 +530,9 @@ __SYCL_EXPORT void *pitched_alloc_device(size_t *resultPitch,
  *  @param   syclContext The context in which we created our image memory handle
  *  @return  sycl range describing image's dimensions
  */
-sycl::range<3> get_image_range(const image_mem_handle memHandle,
-                               const sycl::device &syclDevice,
-                               const sycl::context &syclContext);
+__SYCL_EXPORT sycl::range<3> get_image_range(const image_mem_handle memHandle,
+                                             const sycl::device &syclDevice,
+                                             const sycl::context &syclContext);
 
 /**
  *  @brief   Get the range that describes the image's dimensions
@@ -541,8 +541,8 @@ sycl::range<3> get_image_range(const image_mem_handle memHandle,
  *  @param   syclQueue The queue in which we created our image memory handle
  *  @return  sycl range describing image's dimensions
  */
-sycl::range<3> get_image_range(const image_mem_handle memHandle,
-                               const sycl::queue &syclQueue);
+__SYCL_EXPORT sycl::range<3> get_image_range(const image_mem_handle memHandle,
+                                             const sycl::queue &syclQueue);
 
 /**
  *  @brief   Get the channel type that describes the image memory
@@ -552,7 +552,7 @@ sycl::range<3> get_image_range(const image_mem_handle memHandle,
  *  @param   syclContext The context in which we created our image memory handle
  *  @return  sycl image channel type that describes the image
  */
-sycl::image_channel_type
+__SYCL_EXPORT sycl::image_channel_type
 get_image_channel_type(const image_mem_handle memHandle,
                        const sycl::device &syclDevice,
                        const sycl::context &syclContext);
@@ -564,7 +564,7 @@ get_image_channel_type(const image_mem_handle memHandle,
  *  @param   syclQueue The queue in which we created our image memory handle
  *  @return  sycl image channel type that describes the image
  */
-sycl::image_channel_type
+__SYCL_EXPORT sycl::image_channel_type
 get_image_channel_type(const image_mem_handle memHandle,
                        const sycl::queue &syclQueue);
 
@@ -576,9 +576,10 @@ get_image_channel_type(const image_mem_handle memHandle,
  *  @param   syclContext The context in which we created our image memory handle
  *  @return  The number of channels describing the image
  */
-unsigned int get_image_num_channels(const image_mem_handle memHandle,
-                                    const sycl::device &syclDevice,
-                                    const sycl::context &syclContext);
+__SYCL_EXPORT unsigned int
+get_image_num_channels(const image_mem_handle memHandle,
+                       const sycl::device &syclDevice,
+                       const sycl::context &syclContext);
 
 /**
  *  @brief   Get the number of channels that describes the image memory
@@ -587,8 +588,9 @@ unsigned int get_image_num_channels(const image_mem_handle memHandle,
  *  @param   syclQueue The queue in which we created our image memory handle
  *  @return  The number of channels describing the image
  */
-unsigned int get_image_num_channels(const image_mem_handle memHandle,
-                                    const sycl::queue &syclQueue);
+__SYCL_EXPORT unsigned int
+get_image_num_channels(const image_mem_handle memHandle,
+                       const sycl::queue &syclQueue);
 
 namespace detail {
 // Get the number of coordinates

sycl/include/sycl/ext/oneapi/bindless_images_interop.hpp

@@ -16,7 +16,7 @@ namespace experimental {
 
 /// Opaque interop memory handle type
 struct interop_mem_handle {
-  using raw_handle_type = unsigned long;
+  using raw_handle_type = pi_uint64;
   raw_handle_type raw_handle;
 };
 
@@ -39,7 +39,7 @@ template <typename HandleType> struct external_mem_descriptor {
 
 /// Opaque interop semaphore handle type
 struct interop_semaphore_handle {
-  using raw_handle_type = unsigned long;
+  using raw_handle_type = pi_uint64;
   raw_handle_type raw_handle;
 };
 

sycl/include/sycl/ext/oneapi/bindless_images_memory.hpp

@@ -8,10 +8,17 @@
 
 #pragma once
 
+#include <sycl/context.hpp>
+#include <sycl/device.hpp>
 #include <sycl/ext/oneapi/bindless_images_descriptor.hpp>
+#include <sycl/image.hpp>
 
 namespace sycl {
 __SYCL_INLINE_VER_NAMESPACE(_V1) {
+
+// Forward declaration
+class queue;
+
 namespace ext {
 namespace oneapi {
 namespace experimental {
@@ -28,9 +35,10 @@ class image_mem_impl {
   using raw_handle_type = image_mem_handle;
 
 public:
-  image_mem_impl(const image_descriptor &desc, const device &syclDevice,
-                 const context &syclContext);
-  ~image_mem_impl();
+  __SYCL_EXPORT image_mem_impl(const image_descriptor &desc,
+                               const device &syclDevice,
+                               const context &syclContext);
+  __SYCL_EXPORT ~image_mem_impl();
 
   raw_handle_type get_handle() const { return handle; }
   const image_descriptor &get_descriptor() const { return descriptor; }
@@ -55,9 +63,9 @@ class image_mem {
   image_mem(const image_mem &) = default;
   image_mem(image_mem &&rhs) = default;
 
-  image_mem(const image_descriptor &desc, const device &syclDevice,
-            const context &syclContext);
-  image_mem(const image_descriptor &desc, const queue &syclQueue);
+  __SYCL_EXPORT image_mem(const image_descriptor &desc,
+                          const device &syclDevice, const context &syclContext);
+  __SYCL_EXPORT image_mem(const image_descriptor &desc, const queue &syclQueue);
   ~image_mem() = default;
 
   image_mem &operator=(const image_mem &) = default;
@@ -73,13 +81,14 @@ class image_mem {
   sycl::device get_device() const { return impl->get_device(); }
   sycl::context get_context() const { return impl->get_context(); }
 
-  sycl::range<3> get_range() const;
-  sycl::image_channel_type get_channel_type() const;
-  sycl::image_channel_order get_channel_order() const;
-  unsigned int get_num_channels() const;
-  image_type get_type() const;
+  __SYCL_EXPORT sycl::range<3> get_range() const;
+  __SYCL_EXPORT sycl::image_channel_type get_channel_type() const;
+  __SYCL_EXPORT sycl::image_channel_order get_channel_order() const;
+  __SYCL_EXPORT unsigned int get_num_channels() const;
+  __SYCL_EXPORT image_type get_type() const;
 
-  raw_handle_type get_mip_level_mem_handle(const unsigned int level) const;
+  __SYCL_EXPORT raw_handle_type
+  __SYCL_EXPORT get_mip_level_mem_handle(const unsigned int level) const;
 
 protected:
   std::shared_ptr<detail::image_mem_impl> impl;