Mesa (main): vulkan: Add some border color helpers
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 23 00:28:11 UTC 2022
Module: Mesa
Branch: main
Commit: 981cf8a41d44b8e851b115d2e10535d93bd85ca2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=981cf8a41d44b8e851b115d2e10535d93bd85ca2
Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date: Sat Mar 12 11:00:52 2022 -0600
vulkan: Add some border color helpers
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15359>
---
src/vulkan/runtime/meson.build | 2 +
src/vulkan/runtime/vk_sampler.c | 87 +++++++++++++++++++++++++++++++++++++++++
src/vulkan/runtime/vk_sampler.h | 45 +++++++++++++++++++++
3 files changed, 134 insertions(+)
diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build
index c957b7cfc31..9d8e29d28d0 100644
--- a/src/vulkan/runtime/meson.build
+++ b/src/vulkan/runtime/meson.build
@@ -63,6 +63,8 @@ vulkan_runtime_files = files(
'vk_queue.c',
'vk_queue.h',
'vk_render_pass.c',
+ 'vk_sampler.c',
+ 'vk_sampler.h',
'vk_semaphore.c',
'vk_semaphore.h',
'vk_shader_module.c',
diff --git a/src/vulkan/runtime/vk_sampler.c b/src/vulkan/runtime/vk_sampler.c
new file mode 100644
index 00000000000..30373e03521
--- /dev/null
+++ b/src/vulkan/runtime/vk_sampler.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2022 Collabora, LTD
+ *
+ * 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 "vk_sampler.h"
+#include "vk_util.h"
+
+VkClearColorValue
+vk_border_color_value(VkBorderColor color)
+{
+ switch (color) {
+ case VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK:
+ return (VkClearColorValue) { .float32 = { 0, 0, 0, 0 } };
+ case VK_BORDER_COLOR_INT_TRANSPARENT_BLACK:
+ return (VkClearColorValue) { .int32 = { 0, 0, 0, 0 } };
+ case VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK:
+ return (VkClearColorValue) { .float32 = { 0, 0, 0, 1 } };
+ case VK_BORDER_COLOR_INT_OPAQUE_BLACK:
+ return (VkClearColorValue) { .int32 = { 0, 0, 0, 1 } };
+ case VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE:
+ return (VkClearColorValue) { .float32 = { 1, 1, 1, 1 } };
+ case VK_BORDER_COLOR_INT_OPAQUE_WHITE:
+ return (VkClearColorValue) { .int32 = { 1, 1, 1, 1 } };
+ default:
+ unreachable("Invalid or custom border color enum");
+ }
+}
+
+bool
+vk_border_color_is_int(VkBorderColor color)
+{
+ switch (color) {
+ case VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK:
+ case VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK:
+ case VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE:
+ case VK_BORDER_COLOR_FLOAT_CUSTOM_EXT:
+ return false;
+ case VK_BORDER_COLOR_INT_TRANSPARENT_BLACK:
+ case VK_BORDER_COLOR_INT_OPAQUE_BLACK:
+ case VK_BORDER_COLOR_INT_OPAQUE_WHITE:
+ case VK_BORDER_COLOR_INT_CUSTOM_EXT:
+ return true;
+ default:
+ unreachable("Invalid border color enum");
+ }
+}
+
+VkClearColorValue
+vk_sampler_border_color_value(const VkSamplerCreateInfo *pCreateInfo,
+ VkFormat *format_out)
+{
+ if (pCreateInfo->borderColor == VK_BORDER_COLOR_FLOAT_CUSTOM_EXT ||
+ pCreateInfo->borderColor == VK_BORDER_COLOR_INT_CUSTOM_EXT) {
+ const VkSamplerCustomBorderColorCreateInfoEXT *border_color_info =
+ vk_find_struct_const(pCreateInfo->pNext,
+ SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT);
+ if (format_out)
+ *format_out = border_color_info->format;
+
+ return border_color_info->customBorderColor;
+ } else {
+ if (format_out)
+ *format_out = VK_FORMAT_UNDEFINED;
+
+ return vk_border_color_value(pCreateInfo->borderColor);
+ }
+}
+
diff --git a/src/vulkan/runtime/vk_sampler.h b/src/vulkan/runtime/vk_sampler.h
new file mode 100644
index 00000000000..82c4f07cc85
--- /dev/null
+++ b/src/vulkan/runtime/vk_sampler.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2022 Collabora, LTD
+ *
+ * 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.
+ */
+#ifndef VK_SAMPLER_H
+#define VK_SAMPLER_H
+
+#include <stdbool.h>
+
+#include "vulkan/vulkan_core.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+VkClearColorValue vk_border_color_value(VkBorderColor color);
+bool vk_border_color_is_int(VkBorderColor color);
+
+VkClearColorValue
+vk_sampler_border_color_value(const VkSamplerCreateInfo *pCreateInfo,
+ VkFormat *format_out);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* VK_SAMPLER_H */
More information about the mesa-commit
mailing list