[SYCL][Bindless][UR] adding the image_color_space struct

Author: juanchuletas

sycl/include/sycl/ext/oneapi/bindless_images_descriptor.hpp

@@ -51,7 +51,11 @@ enum class image_type : unsigned int {
   cubemap = 3,
   gather = 4,
 };
-
+/// image color space enum
+enum class image_color_space : uint32_t {
+    linear = 0,
+    srgb   = 1,
+};
 /// A struct to describe the properties of an image.
 struct image_descriptor {
   size_t width{0};
@@ -62,7 +66,7 @@ struct image_descriptor {
   image_type type{image_type::standard};
   unsigned int num_levels{1};
   unsigned int array_size{1};
-  std::optional<image_channel_order> channel_order;
+  image_color_space color_space   = image_color_space::linear;
   image_descriptor() = default;
 
   image_descriptor(range<1> dims, unsigned int num_channels,
@@ -128,19 +132,18 @@ struct image_descriptor {
       throw sycl::exception(sycl::errc::invalid,
                             "Images must have 1, 2, 3, or 4 channels.");
     }
-    if (channel_order.has_value() &&
-        channel_order.value() == image_channel_order::ext_oneapi_srgba) {
-      if (num_channels != 4) {
+    if (color_space == image_color_space::srgb) {
+    if (num_channels != 4) {
         throw sycl::exception(
             sycl::errc::invalid,
-            "ext_oneapi_srgba channel order requires num_channels == 4");
-      }
-      if (channel_type != image_channel_type::unorm_int8) {
+            "sRGB color space requires num_channels == 4");
+    }
+    if (channel_type != image_channel_type::unorm_int8) {
         throw sycl::exception(
             sycl::errc::invalid,
-            "ext_oneapi_srgba channel order requires unorm_int8 channel type");
-      }
+            "sRGB color space requires unorm_int8 channel type");
     }
+}
     switch (this->type) {
     case image_type::standard:
       if (this->array_size > 1) {

sycl/source/detail/bindless_images.cpp

@@ -50,10 +50,13 @@ void populate_ur_structs(const image_descriptor &desc, ur_image_desc_t &urDesc,
 
   urFormat = {};
   urFormat.channelType = sycl::detail::convertChannelType(desc.channel_type);
-  urFormat.channelOrder =
-      sycl::detail::convertChannelOrder(desc.channel_order.value_or(
+  if (desc.color_space == image_color_space::srgb) {
+      urFormat.channelOrder = UR_IMAGE_CHANNEL_ORDER_SRGBA;
+  } else {
+      urFormat.channelOrder = sycl::detail::convertChannelOrder(
           sycl::ext::oneapi::experimental::detail::
-              get_image_default_channel_order(desc.num_channels)));
+              get_image_default_channel_order(desc.num_channels));
+  }
 }
 
 detail::image_mem_impl::image_mem_impl(const image_descriptor &desc,