fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-02 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nil: Support creating images with DRM modifiers

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24795>
This commit is contained in:
Mohamed Ahmed 2024-04-21 17:00:45 +02:00 • committed by Marge Bot
parent e1bd4127f3
commit 6063f96c61
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/nouveau/nil/image.rs
View file

@ -3,6 +3,7 @@
use crate::extent::{units, Extent4D};
use crate::format::Format;
use crate::modifiers::*;
use crate::tiling::Tiling;
use crate::Minify;
@ -80,6 +81,7 @@ pub struct ImageInitInfo {
pub levels: u32,
pub samples: u32,
pub usage: ImageUsageFlags,
pub modifier: u64,
}
/// Represents the data layout of a single slice (level + lod) of an image.
@ -139,7 +141,24 @@ impl Image {
let sample_layout = SampleLayout::choose_sample_layout(info.samples);
let tiling = if (info.usage & IMAGE_USAGE_SPARSE_RESIDENCY_BIT) != 0 {
let tiling = if info.modifier != DRM_FORMAT_MOD_INVALID {
assert!((info.usage & IMAGE_USAGE_SPARSE_RESIDENCY_BIT) == 0);
assert!(info.dim == ImageDim::_2D);
assert!(sample_layout == SampleLayout::_1x1);
if info.modifier == DRM_FORMAT_MOD_LINEAR {
Tiling::default()
} else {
let bl_mod =
BlockLinearModifier::try_from(info.modifier).unwrap();
// We don't support compression yet
assert!(bl_mod.compression_type() == CompressionType::None);
bl_mod
.tiling()
.clamp(info.extent_px.to_B(info.format, sample_layout))
}
} else if (info.usage & IMAGE_USAGE_SPARSE_RESIDENCY_BIT) != 0 {
Tiling::sparse(info.format, info.dim)
} else {
Tiling::choose(
@ -234,9 +253,6 @@ impl Image {
}
if image.levels[0].tiling.is_tiled {
image.tile_mode = u16::from(image.levels[0].tiling.y_log2) << 4
| u16::from(image.levels[0].tiling.z_log2) << 8;
image.pte_kind = Self::choose_pte_kind(
dev,
info.format,
@ -244,6 +260,17 @@ impl Image {
image.compressed,
);
if info.modifier != DRM_FORMAT_MOD_INVALID {
let bl_mod =
BlockLinearModifier::try_from(info.modifier).unwrap();
assert!(bl_mod.pte_kind() == image.pte_kind);
}
}
if image.levels[0].tiling.is_tiled {
image.tile_mode = u16::from(image.levels[0].tiling.y_log2) << 4
| u16::from(image.levels[0].tiling.z_log2) << 8;
image.align_B = std::cmp::max(image.align_B, 4096);
if image.pte_kind >= 0xb && image.pte_kind <= 0xe {
image.align_B = std::cmp::max(image.align_B, 1 << 16);

2
src/nouveau/vulkan/nvk_image.c
View file

@ -600,6 +600,7 @@ nvk_image_init(struct nvk_device *dev,
struct nil_image_init_info nil_info = {
.dim = vk_image_type_to_nil_dim(pCreateInfo->imageType),
.format = nil_format(vk_format_to_pipe_format(format)),
.modifier = DRM_FORMAT_MOD_INVALID,
.extent_px = {
.width = pCreateInfo->extent.width / width_scale,
.height = pCreateInfo->extent.height / height_scale,
@ -618,6 +619,7 @@ nvk_image_init(struct nvk_device *dev,
struct nil_image_init_info stencil_nil_info = {
.dim = vk_image_type_to_nil_dim(pCreateInfo->imageType),
.format = nil_format(PIPE_FORMAT_R32_UINT),
.modifier = DRM_FORMAT_MOD_INVALID,
.extent_px = {
.width = pCreateInfo->extent.width,
.height = pCreateInfo->extent.height,