v3dv: add stubs for the format table and vkGetPhysicalDeviceFormatProperties

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>

diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build
index abf2762..1c6eb1d 100644 (file)
--- a/src/broadcom/vulkan/meson.build
+++ b/src/broadcom/vulkan/meson.build
@@ -53,6 +53,7 @@ v3dv_extensions_h = custom_target(
 
 libv3dv_files = files(
   'v3dv_device.c',
+  'v3dv_formats.c',
   'v3dv_pipeline.c',
   'v3dv_private.h',
   'v3dv_util.c',

diff --git a/src/broadcom/vulkan/v3dv_formats.c b/src/broadcom/vulkan/v3dv_formats.c
new file mode 100644 (file)
index 0000000..2b9bd45
--- /dev/null
+++ b/src/broadcom/vulkan/v3dv_formats.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2019 Raspberry Pi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "v3dv_private.h"
+#include "vk_util.h"
+
+#include "broadcom/cle/v3dx_pack.h"
+#include "util/format/u_format.h"
+
+#define SWIZ(x,y,z,w) {   \
+   PIPE_SWIZZLE_##x,      \
+   PIPE_SWIZZLE_##y,      \
+   PIPE_SWIZZLE_##z,      \
+   PIPE_SWIZZLE_##w       \
+}
+
+#define FORMAT(vk, rt, tex, swiz, return_size)     \
+   [VK_FORMAT_##vk] = {                            \
+      true,                                        \
+      V3D_OUTPUT_IMAGE_FORMAT_##rt,                \
+      TEXTURE_DATA_FORMAT_##tex,                   \
+      swiz,                                        \
+      return_size,                                 \
+   }
+
+#define SWIZ_X001      SWIZ(X, 0, 0, 1)
+#define SWIZ_XY01      SWIZ(X, Y, 0, 1)
+#define SWIZ_XYZ1      SWIZ(X, Y, Z, 1)
+#define SWIZ_XYZW      SWIZ(X, Y, Z, W)
+#define SWIZ_YZWX      SWIZ(Y, Z, W, X)
+#define SWIZ_YZW1      SWIZ(Y, Z, W, 1)
+#define SWIZ_ZYXW      SWIZ(Z, Y, X, W)
+#define SWIZ_ZYX1      SWIZ(Z, Y, X, 1)
+#define SWIZ_XXXY      SWIZ(X, X, X, Y)
+#define SWIZ_XXX1      SWIZ(X, X, X, 1)
+#define SWIZ_XXXX      SWIZ(X, X, X, X)
+#define SWIZ_000X      SWIZ(0, 0, 0, X)
+
+static const struct v3dv_format format_table[] = {
+   FORMAT(R8G8B8A8_UNORM,          RGBA8,       RGBA8,       SWIZ_XYZW, 16),
+   FORMAT(B8G8R8A8_UNORM,          RGBA8,       RGBA8,       SWIZ_ZYXW, 16),
+};
+
+static inline const struct v3dv_format *
+v3dv_get_format(VkFormat format)
+{
+   if (format < ARRAY_SIZE(format_table) && format_table[format].supported)
+      return &format_table[format];
+   else
+      return NULL;
+}
+
+static VkFormatFeatureFlags
+image_format_features(VkFormat vk_format,
+                      const struct v3dv_format *v3dv_format,
+                      VkImageTiling tiling)
+{
+   if (!v3dv_format || !v3dv_format->supported)
+      return 0;
+
+   return 0;
+}
+
+static VkFormatFeatureFlags
+buffer_format_features(VkFormat vk_format, const struct v3dv_format *v3dv_format)
+{
+   if (!v3dv_format || !v3dv_format->supported)
+      return 0;
+
+   /* FIXME */
+   return 0;
+}
+
+void
+v3dv_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice,
+                                       VkFormat format,
+                                       VkFormatProperties* pFormatProperties)
+{
+   const struct v3dv_format *v3dv_format = v3dv_get_format(format);
+
+   *pFormatProperties = (VkFormatProperties) {
+      .linearTilingFeatures =
+         image_format_features(format, v3dv_format, VK_IMAGE_TILING_LINEAR),
+      .optimalTilingFeatures =
+         image_format_features(format, v3dv_format, VK_IMAGE_TILING_OPTIMAL),
+      .bufferFeatures =
+         buffer_format_features(format, v3dv_format),
+   };
+}
+

diff --git a/src/broadcom/vulkan/v3dv_private.h b/src/broadcom/vulkan/v3dv_private.h
index 6837e8f..2e7dc99 100644 (file)
--- a/src/broadcom/vulkan/v3dv_private.h
+++ b/src/broadcom/vulkan/v3dv_private.h
@@ -171,6 +171,28 @@ struct v3dv_device_memory {
    void *map;
 };
 
+#define V3D_OUTPUT_IMAGE_FORMAT_NO 255
+
+struct v3dv_format {
+   bool supported;
+
+   /* One of V3D33_OUTPUT_IMAGE_FORMAT_*, or OUTPUT_IMAGE_FORMAT_NO */
+   uint8_t rt_type;
+
+   /* One of V3D33_TEXTURE_DATA_FORMAT_*. */
+   uint8_t tex_type;
+
+   /* Swizzle to apply to the RGBA shader output for storing to the tile
+    * buffer, to the RGBA tile buffer to produce shader input (for
+    * blending), and for turning the rgba8888 texture sampler return
+    * value into shader rgba values.
+    */
+   uint8_t swizzle[4];
+
+   /* Whether the return value is 16F/I/UI or 32F/I/UI. */
+   uint8_t return_size;
+};
+
 uint32_t v3dv_physical_device_api_version(struct v3dv_physical_device *dev);
 
 int v3dv_get_instance_entrypoint_index(const char *name);