From 299f32736a9c8489e466d606ef1bfd93de04e0b5 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 5 Apr 2024 17:13:56 -0500 Subject: [PATCH] nil: Move to a single header file Part-of: --- src/nouveau/nil/meson.build | 3 +- src/nouveau/nil/{nil_image.h => nil.h} | 33 ++++++++++++++++++-- src/nouveau/nil/nil_format.c | 2 +- src/nouveau/nil/nil_format.h | 43 -------------------------- src/nouveau/nil/nil_image.c | 2 +- src/nouveau/nil/nil_image_tic.c | 2 +- src/nouveau/vulkan/nvk_buffer_view.c | 3 +- src/nouveau/vulkan/nvk_cmd_clear.c | 1 - src/nouveau/vulkan/nvk_cmd_draw.c | 1 - src/nouveau/vulkan/nvk_image.c | 1 - src/nouveau/vulkan/nvk_image.h | 2 +- src/nouveau/vulkan/nvk_image_view.h | 2 +- 12 files changed, 37 insertions(+), 58 deletions(-) rename src/nouveau/nil/{nil_image.h => nil.h} (88%) delete mode 100644 src/nouveau/nil/nil_format.h diff --git a/src/nouveau/nil/meson.build b/src/nouveau/nil/meson.build index f4a1c26eeb277..1b690ffed5fb1 100644 --- a/src/nouveau/nil/meson.build +++ b/src/nouveau/nil/meson.build @@ -2,10 +2,9 @@ # SPDX-License-Identifier: MIT libnil_files = files( + 'nil.h', 'nil_format.c', - 'nil_format.h', 'nil_image.c', - 'nil_image.h', 'nil_image_tic.c', ) diff --git a/src/nouveau/nil/nil_image.h b/src/nouveau/nil/nil.h similarity index 88% rename from src/nouveau/nil/nil_image.h rename to src/nouveau/nil/nil.h index c3ea1190ff87a..b53afea2d50c6 100644 --- a/src/nouveau/nil/nil_image.h +++ b/src/nouveau/nil/nil.h @@ -2,8 +2,8 @@ * Copyright © 2022 Collabora Ltd. * SPDX-License-Identifier: MIT */ -#ifndef NIL_IMAGE_H -#define NIL_IMAGE_H +#ifndef NIL_H +#define NIL_H #include #include @@ -14,6 +14,33 @@ struct nv_device_info; +/* We don't have our own format enum; we use PIPE_FORMAT for everything */ + +bool nil_format_supports_texturing(struct nv_device_info *dev, + enum pipe_format format); + +bool nil_format_supports_filtering(struct nv_device_info *dev, + enum pipe_format format); + +bool nil_format_supports_buffer(struct nv_device_info *dev, + enum pipe_format format); + +bool nil_format_supports_storage(struct nv_device_info *dev, + enum pipe_format format); + +bool nil_format_supports_color_targets(struct nv_device_info *dev, + enum pipe_format format); + +bool nil_format_supports_blending(struct nv_device_info *dev, + enum pipe_format format); + +bool nil_format_supports_depth_stencil(struct nv_device_info *dev, + enum pipe_format format); + +uint8_t nil_format_to_color_target(enum pipe_format format); + +uint8_t nil_format_to_depth_stencil(enum pipe_format format); + enum ENUM_PACKED nil_image_dim { NIL_IMAGE_DIM_1D = 1, NIL_IMAGE_DIM_2D = 2, @@ -292,4 +319,4 @@ nil_sparse_block_extent_px(enum pipe_format format, enum nil_image_dim dim, enum nil_sample_layout sample_layout); -#endif /* NIL_IMAGE_H */ +#endif /* NIL_H */ diff --git a/src/nouveau/nil/nil_format.c b/src/nouveau/nil/nil_format.c index 0cb48c5ada657..9bc1c4e179e42 100644 --- a/src/nouveau/nil/nil_format.c +++ b/src/nouveau/nil/nil_format.c @@ -2,7 +2,7 @@ * Copyright © 2022 Collabora Ltd. * SPDX-License-Identifier: MIT */ -#include "nil_format.h" +#include "nil.h" #include "nil_format_table.h" #include "nouveau_device.h" diff --git a/src/nouveau/nil/nil_format.h b/src/nouveau/nil/nil_format.h deleted file mode 100644 index 33d31772e7839..0000000000000 --- a/src/nouveau/nil/nil_format.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright © 2022 Collabora Ltd. - * SPDX-License-Identifier: MIT - */ -#ifndef NIL_FORMAT_H -#define NIL_FORMAT_H - -#include -#include -#include - -#include "util/format/u_format.h" - -struct nv_device_info; - -/* We don't have our own format enum; we use PIPE_FORMAT for everything */ - -bool nil_format_supports_texturing(struct nv_device_info *dev, - enum pipe_format format); - -bool nil_format_supports_filtering(struct nv_device_info *dev, - enum pipe_format format); - -bool nil_format_supports_buffer(struct nv_device_info *dev, - enum pipe_format format); - -bool nil_format_supports_storage(struct nv_device_info *dev, - enum pipe_format format); - -bool nil_format_supports_color_targets(struct nv_device_info *dev, - enum pipe_format format); - -bool nil_format_supports_blending(struct nv_device_info *dev, - enum pipe_format format); - -bool nil_format_supports_depth_stencil(struct nv_device_info *dev, - enum pipe_format format); - -uint8_t nil_format_to_color_target(enum pipe_format format); - -uint8_t nil_format_to_depth_stencil(enum pipe_format format); - -#endif /* NIL_FORMAT_H */ diff --git a/src/nouveau/nil/nil_image.c b/src/nouveau/nil/nil_image.c index e4b71e267e2ee..389396296a00b 100644 --- a/src/nouveau/nil/nil_image.c +++ b/src/nouveau/nil/nil_image.c @@ -2,7 +2,7 @@ * Copyright © 2022 Collabora Ltd. * SPDX-License-Identifier: MIT */ -#include "nil_image.h" +#include "nil.h" #include "util/u_math.h" diff --git a/src/nouveau/nil/nil_image_tic.c b/src/nouveau/nil/nil_image_tic.c index 282659b7addf9..a3f92d301f16d 100644 --- a/src/nouveau/nil/nil_image_tic.c +++ b/src/nouveau/nil/nil_image_tic.c @@ -2,7 +2,7 @@ * Copyright © 2022 Collabora Ltd. * SPDX-License-Identifier: MIT */ -#include "nil_image.h" +#include "nil.h" #include "nil_format_table.h" #include "util/bitpack_helpers.h" diff --git a/src/nouveau/vulkan/nvk_buffer_view.c b/src/nouveau/vulkan/nvk_buffer_view.c index 7ff07cb309694..3a7349cfc93d6 100644 --- a/src/nouveau/vulkan/nvk_buffer_view.c +++ b/src/nouveau/vulkan/nvk_buffer_view.c @@ -4,8 +4,7 @@ */ #include "nvk_buffer_view.h" -#include "nil_format.h" -#include "nil_image.h" +#include "nil.h" #include "nvk_buffer.h" #include "nvk_entrypoints.h" #include "nvk_device.h" diff --git a/src/nouveau/vulkan/nvk_cmd_clear.c b/src/nouveau/vulkan/nvk_cmd_clear.c index 7749dd1cea40c..a63e00299e7bc 100644 --- a/src/nouveau/vulkan/nvk_cmd_clear.c +++ b/src/nouveau/vulkan/nvk_cmd_clear.c @@ -11,7 +11,6 @@ #include "nvk_mme.h" #include "nvk_physical_device.h" -#include "nil_format.h" #include "vk_format.h" #include "nvk_cl9097.h" diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index f12d81d85b340..492945b99eff2 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -13,7 +13,6 @@ #include "nvk_physical_device.h" #include "nvk_shader.h" -#include "nil_format.h" #include "util/bitpack_helpers.h" #include "vk_format.h" #include "vk_render_pass.h" diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 358053fef9534..23e1f4ee84f50 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -10,7 +10,6 @@ #include "nvk_format.h" #include "nvk_physical_device.h" -#include "nil_format.h" #include "vk_format.h" #include "clb097.h" diff --git a/src/nouveau/vulkan/nvk_image.h b/src/nouveau/vulkan/nvk_image.h index a0f7af0276bfb..296d9096073c5 100644 --- a/src/nouveau/vulkan/nvk_image.h +++ b/src/nouveau/vulkan/nvk_image.h @@ -9,7 +9,7 @@ #include "vk_image.h" -#include "nil_image.h" +#include "nil.h" /* Because small images can end up with an array_stride_B that is less than * the sparse block size (in bytes), we have to set SINGLE_MIPTAIL_BIT when diff --git a/src/nouveau/vulkan/nvk_image_view.h b/src/nouveau/vulkan/nvk_image_view.h index f20f95fcfab7f..d3e5e873f7a33 100644 --- a/src/nouveau/vulkan/nvk_image_view.h +++ b/src/nouveau/vulkan/nvk_image_view.h @@ -9,7 +9,7 @@ #include "vk_image.h" -#include "nil_image.h" +#include "nil.h" struct nvk_device;