This only used by vulkan drivers and depends on vulkan util, so do the move to decouple
nir from vulkan utils
Reviewed-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23444>
#include "nir/nir.h"
#include "nir/nir_builder.h"
#include "nir/nir_serialize.h"
-#include "nir/nir_vulkan.h"
#include "nir/radv_nir.h"
#include "spirv/nir_spirv.h"
#include "util/disk_cache.h"
#include "aco_interface.h"
#include "sid.h"
#include "vk_format.h"
+#include "vk_nir_convert_ycbcr.h"
bool
radv_shader_need_indirect_descriptor_sets(const struct radv_shader *shader)
#include "nir/nir.h"
#include "nir/nir_builder.h"
#include "nir/nir_serialize.h"
-#include "nir/nir_vulkan.h"
#include "nir/radv_nir.h"
#include "spirv/nir_spirv.h"
#include "util/disk_cache.h"
#include "radv_private.h"
#include "radv_shader.h"
#include "radv_shader_args.h"
+#include "vk_nir_convert_ycbcr.h"
#include "vk_pipeline.h"
#include "vk_render_pass.h"
#include "vk_util.h"
#include "nir/nir.h"
#include "nir/nir_builder.h"
#include "nir/nir_serialize.h"
-#include "nir/nir_vulkan.h"
#include "nir/radv_nir.h"
#include "spirv/nir_spirv.h"
#include "util/disk_cache.h"
#include "radv_private.h"
#include "radv_shader.h"
#include "radv_shader_args.h"
+#include "vk_nir_convert_ycbcr.h"
#include "vk_pipeline.h"
#include "vk_render_pass.h"
#include "vk_util.h"
#include "nir/nir.h"
#include "nir/nir_builder.h"
-#include "nir/nir_vulkan.h"
+#include "vk_nir_convert_ycbcr.h"
#include "compiler/spirv/spirv.h"
#include "qpu/qpu_disasm.h"
#include "compiler/nir/nir_builder.h"
-#include "nir/nir_vulkan.h"
#include "nir/nir_serialize.h"
#include "util/u_atomic.h"
#include "util/u_prim.h"
#include "util/os_time.h"
+#include "vk_nir_convert_ycbcr.h"
#include "vk_pipeline.h"
#include "vulkan/util/vk_format.h"
'nir_control_flow.c',
'nir_control_flow.h',
'nir_control_flow_private.h',
- 'nir_convert_ycbcr.c',
'nir_deref.c',
'nir_deref.h',
'nir_divergence_analysis.c',
'nir_to_lcssa.c',
'nir_validate.c',
'nir_vla.h',
- 'nir_vulkan.h',
'nir_worklist.c',
'nir_worklist.h',
'nir_xfb_info.h',
#include "spirv/nir_spirv.h"
#include "util/mesa-sha1.h"
#include "nir/nir_xfb_info.h"
-#include "nir/nir_vulkan.h"
+#include "vk_nir_convert_ycbcr.h"
#include "vk_pipeline.h"
#include "vk_util.h"
#include "compiler/brw_nir.h"
#include "compiler/brw_nir_rt.h"
#include "anv_nir.h"
-#include "nir/nir_vulkan.h"
#include "nir/nir_xfb_info.h"
#include "spirv/nir_spirv.h"
+#include "vk_nir_convert_ycbcr.h"
#include "vk_nir.h"
#include "vk_pipeline.h"
#include "vk_render_pass.h"
#include "anv_private.h"
#include "nir/nir.h"
#include "nir/nir_builder.h"
-#include "nir/nir_vulkan.h"
+#include "vk_nir_convert_ycbcr.h"
struct ycbcr_state {
nir_builder *builder;
#include "nir_to_dxil.h"
#include "nir_builder.h"
#include "nir_builtin_builder.h"
-#include "nir_vulkan.h"
#include "dxil_nir.h"
+#include "vk_nir_convert_ycbcr.h"
static nir_ssa_def *
dzn_nir_create_bo_desc(nir_builder *b,
'vk_instance.h',
'vk_log.c',
'vk_log.h',
+ 'vk_nir_convert_ycbcr.c',
+ 'vk_nir_convert_ycbcr.h',
'vk_nir.c',
'vk_nir.h',
'vk_object.c',
* IN THE SOFTWARE.
*/
-#include "nir_vulkan.h"
-#include "vulkan/util/vk_format.h"
-#include "vulkan/runtime/vk_ycbcr_conversion.h"
+#include "vk_nir_convert_ycbcr.h"
+
+#include "vk_format.h"
+#include "vk_ycbcr_conversion.h"
+
#include <math.h>
static nir_ssa_def *
* IN THE SOFTWARE.
*/
-#ifndef NIR_VULKAN_H
-#define NIR_VULKAN_H
+#ifndef VK_NIR_CONVERT_YCBCR_H
+#define VK_NIR_CONVERT_YCBCR_H
#include "nir.h"
#include "nir_builder.h"
} /* extern "C" */
#endif
-#endif /* NIR_VULKAN_H */
+#endif /* VK_NIR_CONVERT_YCBCR_H */