fix(metal): fix incorrect size in buffer to image copy
This commit is contained in:
parent
2f9fd5d69c
commit
4771cd1602
3 changed files with 128 additions and 114 deletions
|
|
@ -7,122 +7,142 @@
|
|||
|
||||
#include "video_core/engines/maxwell_3d.h"
|
||||
#include "video_core/surface.h"
|
||||
#include "video_core/texture_cache/types.h"
|
||||
|
||||
namespace Metal::MaxwellToMTL {
|
||||
|
||||
using Maxwell = Tegra::Engines::Maxwell3D::Regs;
|
||||
|
||||
// TODO: replace some of the invalid formats with the correct ones and emulate those which don't map
|
||||
// directly
|
||||
constexpr std::array<MTL::PixelFormat, VideoCore::Surface::MaxPixelFormat> FORMAT_TABLE = {
|
||||
MTL::PixelFormatInvalid, // A8B8G8R8_UNORM
|
||||
MTL::PixelFormatInvalid, // A8B8G8R8_SNORM
|
||||
MTL::PixelFormatInvalid, // A8B8G8R8_SINT
|
||||
MTL::PixelFormatInvalid, // A8B8G8R8_UINT
|
||||
MTL::PixelFormatInvalid, // R5G6B5_UNORM
|
||||
MTL::PixelFormatB5G6R5Unorm, // B5G6R5_UNORM
|
||||
MTL::PixelFormatInvalid, // A1R5G5B5_UNORM
|
||||
MTL::PixelFormatRGBA8Unorm, // A2B10G10R10_UNORM (hack)
|
||||
MTL::PixelFormatInvalid, // A2B10G10R10_UINT
|
||||
MTL::PixelFormatInvalid, // A2R10G10B10_UNORM
|
||||
MTL::PixelFormatInvalid, // A1B5G5R5_UNORM
|
||||
MTL::PixelFormatInvalid, // A5B5G5R1_UNORM
|
||||
MTL::PixelFormatR8Unorm, // R8_UNORM
|
||||
MTL::PixelFormatR8Snorm, // R8_SNORM
|
||||
MTL::PixelFormatR8Sint, // R8_SINT
|
||||
MTL::PixelFormatR8Uint, // R8_UINT
|
||||
MTL::PixelFormatRGBA16Float, // R16G16B16A16_FLOAT
|
||||
MTL::PixelFormatRGBA16Unorm, // R16G16B16A16_UNORM
|
||||
MTL::PixelFormatRGBA16Snorm, // R16G16B16A16_SNORM
|
||||
MTL::PixelFormatRGBA16Sint, // R16G16B16A16_SINT
|
||||
MTL::PixelFormatRGBA16Uint, // R16G16B16A16_UINT
|
||||
MTL::PixelFormatInvalid, // B10G11R11_FLOAT
|
||||
MTL::PixelFormatRGBA32Uint, // R32G32B32A32_UINT
|
||||
MTL::PixelFormatBC1_RGBA, // BC1_RGBA_UNORM
|
||||
MTL::PixelFormatInvalid, // BC2_UNORM
|
||||
MTL::PixelFormatInvalid, // BC3_UNORM
|
||||
MTL::PixelFormatBC4_RUnorm, // BC4_UNORM
|
||||
MTL::PixelFormatBC4_RSnorm, // BC4_SNORM
|
||||
MTL::PixelFormatInvalid, // BC5_UNORM
|
||||
MTL::PixelFormatInvalid, // BC5_SNORM
|
||||
MTL::PixelFormatInvalid, // BC7_UNORM
|
||||
MTL::PixelFormatInvalid, // BC6H_UFLOAT
|
||||
MTL::PixelFormatInvalid, // BC6H_SFLOAT
|
||||
MTL::PixelFormatASTC_4x4_LDR, // ASTC_2D_4X4_UNORM
|
||||
MTL::PixelFormatBGRA8Unorm, // B8G8R8A8_UNORM
|
||||
MTL::PixelFormatRGBA32Float, // R32G32B32A32_FLOAT
|
||||
MTL::PixelFormatRGBA32Sint, // R32G32B32A32_SINT
|
||||
MTL::PixelFormatRG32Float, // R32G32_FLOAT
|
||||
MTL::PixelFormatRG32Sint, // R32G32_SINT
|
||||
MTL::PixelFormatR32Float, // R32_FLOAT
|
||||
MTL::PixelFormatR16Float, // R16_FLOAT
|
||||
MTL::PixelFormatR16Unorm, // R16_UNORM
|
||||
MTL::PixelFormatR16Snorm, // R16_SNORM
|
||||
MTL::PixelFormatR16Uint, // R16_UINT
|
||||
MTL::PixelFormatR16Sint, // R16_SINT
|
||||
MTL::PixelFormatRG16Unorm, // R16G16_UNORM
|
||||
MTL::PixelFormatRG16Float, // R16G16_FLOAT
|
||||
MTL::PixelFormatRG16Uint, // R16G16_UINT
|
||||
MTL::PixelFormatRG16Sint, // R16G16_SINT
|
||||
MTL::PixelFormatRG16Snorm, // R16G16_SNORM
|
||||
MTL::PixelFormatInvalid, // R32G32B32_FLOAT
|
||||
MTL::PixelFormatRGBA8Unorm, // A8B8G8R8_SRGB (hack)
|
||||
MTL::PixelFormatRG8Unorm, // R8G8_UNORM
|
||||
MTL::PixelFormatRG8Snorm, // R8G8_SNORM
|
||||
MTL::PixelFormatRG8Sint, // R8G8_SINT
|
||||
MTL::PixelFormatRG8Uint, // R8G8_UINT
|
||||
MTL::PixelFormatRG32Uint, // R32G32_UINT
|
||||
MTL::PixelFormatInvalid, // R16G16B16X16_FLOAT
|
||||
MTL::PixelFormatR32Uint, // R32_UINT
|
||||
MTL::PixelFormatR32Sint, // R32_SINT
|
||||
MTL::PixelFormatASTC_8x8_LDR, // ASTC_2D_8X8_UNORM
|
||||
MTL::PixelFormatASTC_8x5_LDR, // ASTC_2D_8X5_UNORM
|
||||
MTL::PixelFormatASTC_5x4_LDR, // ASTC_2D_5X4_UNORM
|
||||
MTL::PixelFormatBGRA8Unorm_sRGB, // B8G8R8A8_SRGB
|
||||
MTL::PixelFormatBC1_RGBA_sRGB, // BC1_RGBA_SRGB
|
||||
MTL::PixelFormatInvalid, // BC2_SRGB
|
||||
MTL::PixelFormatInvalid, // BC3_SRGB
|
||||
MTL::PixelFormatBC7_RGBAUnorm_sRGB, // BC7_SRGB
|
||||
MTL::PixelFormatABGR4Unorm, // A4B4G4R4_UNORM
|
||||
MTL::PixelFormatInvalid, // G4R4_UNORM
|
||||
MTL::PixelFormatASTC_4x4_sRGB, // ASTC_2D_4X4_SRGB
|
||||
MTL::PixelFormatASTC_8x8_sRGB, // ASTC_2D_8X8_SRGB
|
||||
MTL::PixelFormatASTC_8x5_sRGB, // ASTC_2D_8X5_SRGB
|
||||
MTL::PixelFormatASTC_5x4_sRGB, // ASTC_2D_5X4_SRGB
|
||||
MTL::PixelFormatASTC_5x5_LDR, // ASTC_2D_5X5_UNORM
|
||||
MTL::PixelFormatASTC_5x5_sRGB, // ASTC_2D_5X5_SRGB
|
||||
MTL::PixelFormatASTC_10x8_LDR, // ASTC_2D_10X8_UNORM
|
||||
MTL::PixelFormatASTC_10x8_sRGB, // ASTC_2D_10X8_SRGB
|
||||
MTL::PixelFormatASTC_6x6_LDR, // ASTC_2D_6X6_UNORM
|
||||
MTL::PixelFormatASTC_6x6_sRGB, // ASTC_2D_6X6_SRGB
|
||||
MTL::PixelFormatASTC_10x6_LDR, // ASTC_2D_10X6_UNORM
|
||||
MTL::PixelFormatASTC_10x6_sRGB, // ASTC_2D_10X6_SRGB
|
||||
MTL::PixelFormatASTC_10x5_LDR, // ASTC_2D_10X5_UNORM
|
||||
MTL::PixelFormatASTC_10x5_sRGB, // ASTC_2D_10X5_SRGB
|
||||
MTL::PixelFormatASTC_10x10_LDR, // ASTC_2D_10X10_UNORM
|
||||
MTL::PixelFormatASTC_10x10_sRGB, // ASTC_2D_10X10_SRGB
|
||||
MTL::PixelFormatASTC_12x10_LDR, // ASTC_2D_12X10_UNORM
|
||||
MTL::PixelFormatASTC_12x10_sRGB, // ASTC_2D_12X10_SRGB
|
||||
MTL::PixelFormatASTC_12x12_LDR, // ASTC_2D_12X12_UNORM
|
||||
MTL::PixelFormatASTC_12x12_sRGB, // ASTC_2D_12X12_SRGB
|
||||
MTL::PixelFormatASTC_8x6_LDR, // ASTC_2D_8X6_UNORM
|
||||
MTL::PixelFormatASTC_8x6_sRGB, // ASTC_2D_8X6_SRGB
|
||||
MTL::PixelFormatASTC_6x5_LDR, // ASTC_2D_6X5_UNORM
|
||||
MTL::PixelFormatASTC_6x5_sRGB, // ASTC_2D_6X5_SRGB
|
||||
MTL::PixelFormatInvalid, // E5B9G9R9_FLOAT
|
||||
MTL::PixelFormatDepth32Float, // D32_FLOAT
|
||||
MTL::PixelFormatDepth16Unorm, // D16_UNORM
|
||||
MTL::PixelFormatInvalid, // X8_D24_UNORM
|
||||
MTL::PixelFormatStencil8, // S8_UINT
|
||||
MTL::PixelFormatDepth24Unorm_Stencil8, // D24_UNORM_S8_UINT
|
||||
MTL::PixelFormatInvalid, // S8_UINT_D24_UNORM
|
||||
MTL::PixelFormatDepth32Float_Stencil8, // D32_FLOAT_S8_UINT
|
||||
struct PixelFormatInfo {
|
||||
MTL::PixelFormat pixel_format;
|
||||
size_t bytes_per_block;
|
||||
VideoCommon::Extent2D block_texel_size{1, 1};
|
||||
};
|
||||
|
||||
inline MTL::PixelFormat GetPixelFormat(VideoCore::Surface::PixelFormat pixel_format) {
|
||||
// TODO: replace some of the invalid formats with the correct ones and emulate those which don't map
|
||||
// directly
|
||||
// TODO: set the sizes of other formats as well
|
||||
constexpr std::array<PixelFormatInfo, VideoCore::Surface::MaxPixelFormat> FORMAT_TABLE = {{
|
||||
{MTL::PixelFormatInvalid, 0}, // A8B8G8R8_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // A8B8G8R8_SNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // A8B8G8R8_SINT
|
||||
{MTL::PixelFormatInvalid, 0}, // A8B8G8R8_UINT
|
||||
{MTL::PixelFormatInvalid, 0}, // R5G6B5_UNORM
|
||||
{MTL::PixelFormatB5G6R5Unorm, 2}, // B5G6R5_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // A1R5G5B5_UNORM
|
||||
{MTL::PixelFormatRGBA8Unorm, 4}, // A2B10G10R10_UNORM (hack)
|
||||
{MTL::PixelFormatInvalid, 0}, // A2B10G10R10_UINT
|
||||
{MTL::PixelFormatInvalid, 0}, // A2R10G10B10_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // A1B5G5R5_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // A5B5G5R1_UNORM
|
||||
{MTL::PixelFormatR8Unorm, 1}, // R8_UNORM
|
||||
{MTL::PixelFormatR8Snorm, 1}, // R8_SNORM
|
||||
{MTL::PixelFormatR8Sint, 1}, // R8_SINT
|
||||
{MTL::PixelFormatR8Uint, 1}, // R8_UINT
|
||||
{MTL::PixelFormatRGBA16Float, 8}, // R16G16B16A16_FLOAT
|
||||
{MTL::PixelFormatRGBA16Unorm, 8}, // R16G16B16A16_UNORM
|
||||
{MTL::PixelFormatRGBA16Snorm, 8}, // R16G16B16A16_SNORM
|
||||
{MTL::PixelFormatRGBA16Sint, 8}, // R16G16B16A16_SINT
|
||||
{MTL::PixelFormatRGBA16Uint, 8}, // R16G16B16A16_UINT
|
||||
{MTL::PixelFormatInvalid, 0}, // B10G11R11_FLOAT
|
||||
{MTL::PixelFormatRGBA32Uint, 16}, // R32G32B32A32_UINT
|
||||
{MTL::PixelFormatBC1_RGBA, 8, {4, 4}}, // BC1_RGBA_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // BC2_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // BC3_UNORM
|
||||
{MTL::PixelFormatBC4_RUnorm, 8, {4, 4}}, // BC4_UNORM
|
||||
{MTL::PixelFormatBC4_RSnorm, 0}, // BC4_SNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // BC5_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // BC5_SNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // BC7_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // BC6H_UFLOAT
|
||||
{MTL::PixelFormatInvalid, 0}, // BC6H_SFLOAT
|
||||
{MTL::PixelFormatASTC_4x4_LDR, 0}, // ASTC_2D_4X4_UNORM
|
||||
{MTL::PixelFormatBGRA8Unorm, 4}, // B8G8R8A8_UNORM
|
||||
{MTL::PixelFormatRGBA32Float, 16}, // R32G32B32A32_FLOAT
|
||||
{MTL::PixelFormatRGBA32Sint, 16}, // R32G32B32A32_SINT
|
||||
{MTL::PixelFormatRG32Float, 8}, // R32G32_FLOAT
|
||||
{MTL::PixelFormatRG32Sint, 8}, // R32G32_SINT
|
||||
{MTL::PixelFormatR32Float, 4}, // R32_FLOAT
|
||||
{MTL::PixelFormatR16Float, 2}, // R16_FLOAT
|
||||
{MTL::PixelFormatR16Unorm, 2}, // R16_UNORM
|
||||
{MTL::PixelFormatR16Snorm, 2}, // R16_SNORM
|
||||
{MTL::PixelFormatR16Uint, 2}, // R16_UINT
|
||||
{MTL::PixelFormatR16Sint, 2}, // R16_SINT
|
||||
{MTL::PixelFormatRG16Unorm, 4}, // R16G16_UNORM
|
||||
{MTL::PixelFormatRG16Float, 4}, // R16G16_FLOAT
|
||||
{MTL::PixelFormatRG16Uint, 4}, // R16G16_UINT
|
||||
{MTL::PixelFormatRG16Sint, 4}, // R16G16_SINT
|
||||
{MTL::PixelFormatRG16Snorm, 4}, // R16G16_SNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // R32G32B32_FLOAT
|
||||
{MTL::PixelFormatRGBA8Unorm, 4}, // A8B8G8R8_SRGB
|
||||
{MTL::PixelFormatRG8Unorm, 2}, // R8G8_UNORM
|
||||
{MTL::PixelFormatRG8Snorm, 2}, // R8G8_SNORM
|
||||
{MTL::PixelFormatRG8Sint, 2}, // R8G8_SINT
|
||||
{MTL::PixelFormatRG8Uint, 2}, // R8G8_UINT
|
||||
{MTL::PixelFormatRG32Uint, 8}, // R32G32_UINT
|
||||
{MTL::PixelFormatInvalid, 0}, // R16G16B16X16_FLOAT
|
||||
{MTL::PixelFormatR32Uint, 4}, // R32_UINT
|
||||
{MTL::PixelFormatR32Sint, 4}, // R32_SINT
|
||||
{MTL::PixelFormatASTC_8x8_LDR, 16, {8, 8}}, // ASTC_2D_8X8_UNORM
|
||||
{MTL::PixelFormatASTC_8x5_LDR, 0}, // ASTC_2D_8X5_UNORM
|
||||
{MTL::PixelFormatASTC_5x4_LDR, 0}, // ASTC_2D_5X4_UNORM
|
||||
{MTL::PixelFormatBGRA8Unorm_sRGB, 0}, // B8G8R8A8_SRGB
|
||||
{MTL::PixelFormatBC1_RGBA_sRGB, 0}, // BC1_RGBA_SRGB
|
||||
{MTL::PixelFormatInvalid, 0}, // BC2_SRGB
|
||||
{MTL::PixelFormatInvalid, 0}, // BC3_SRGB
|
||||
{MTL::PixelFormatBC7_RGBAUnorm_sRGB, 0}, // BC7_SRGB
|
||||
{MTL::PixelFormatABGR4Unorm, 0}, // A4B4G4R4_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // G4R4_UNORM
|
||||
{MTL::PixelFormatASTC_4x4_sRGB, 16, {4, 4}}, // ASTC_2D_4X4_SRGB
|
||||
{MTL::PixelFormatASTC_8x8_sRGB, 0}, // ASTC_2D_8X8_SRGB
|
||||
{MTL::PixelFormatASTC_8x5_sRGB, 0}, // ASTC_2D_8X5_SRGB
|
||||
{MTL::PixelFormatASTC_5x4_sRGB, 0}, // ASTC_2D_5X4_SRGB
|
||||
{MTL::PixelFormatASTC_5x5_LDR, 0}, // ASTC_2D_5X5_UNORM
|
||||
{MTL::PixelFormatASTC_5x5_sRGB, 0}, // ASTC_2D_5X5_SRGB
|
||||
{MTL::PixelFormatASTC_10x8_LDR, 0}, // ASTC_2D_10X8_UNORM
|
||||
{MTL::PixelFormatASTC_10x8_sRGB, 0}, // ASTC_2D_10X8_SRGB
|
||||
{MTL::PixelFormatASTC_6x6_LDR, 0}, // ASTC_2D_6X6_UNORM
|
||||
{MTL::PixelFormatASTC_6x6_sRGB, 0}, // ASTC_2D_6X6_SRGB
|
||||
{MTL::PixelFormatASTC_10x6_LDR, 0}, // ASTC_2D_10X6_UNORM
|
||||
{MTL::PixelFormatASTC_10x6_sRGB, 0}, // ASTC_2D_10X6_SRGB
|
||||
{MTL::PixelFormatASTC_10x5_LDR, 0}, // ASTC_2D_10X5_UNORM
|
||||
{MTL::PixelFormatASTC_10x5_sRGB, 0}, // ASTC_2D_10X5_SRGB
|
||||
{MTL::PixelFormatASTC_10x10_LDR, 0}, // ASTC_2D_10X10_UNORM
|
||||
{MTL::PixelFormatASTC_10x10_sRGB, 0}, // ASTC_2D_10X10_SRGB
|
||||
{MTL::PixelFormatASTC_12x10_LDR, 0}, // ASTC_2D_12X10_UNORM
|
||||
{MTL::PixelFormatASTC_12x10_sRGB, 0}, // ASTC_2D_12X10_SRGB
|
||||
{MTL::PixelFormatASTC_12x12_LDR, 0}, // ASTC_2D_12X12_UNORM
|
||||
{MTL::PixelFormatASTC_12x12_sRGB, 0}, // ASTC_2D_12X12_SRGB
|
||||
{MTL::PixelFormatASTC_8x6_LDR, 0}, // ASTC_2D_8X6_UNORM
|
||||
{MTL::PixelFormatASTC_8x6_sRGB, 0}, // ASTC_2D_8X6_SRGB
|
||||
{MTL::PixelFormatASTC_6x5_LDR, 0}, // ASTC_2D_6X5_UNORM
|
||||
{MTL::PixelFormatASTC_6x5_sRGB, 0}, // ASTC_2D_6X5_SRGB
|
||||
{MTL::PixelFormatInvalid, 0}, // E5B9G9R9_FLOAT
|
||||
{MTL::PixelFormatDepth32Float, 0}, // D32_FLOAT
|
||||
{MTL::PixelFormatDepth16Unorm, 0}, // D16_UNORM
|
||||
{MTL::PixelFormatInvalid, 0}, // X8_D24_UNORM
|
||||
{MTL::PixelFormatStencil8, 0}, // S8_UINT
|
||||
{MTL::PixelFormatDepth24Unorm_Stencil8, 0}, // D24_UNORM_S8_UINT
|
||||
{MTL::PixelFormatInvalid, 0}, // S8_UINT_D24_UNORM
|
||||
{MTL::PixelFormatDepth32Float_Stencil8, 0}, // D32_FLOAT_S8_UINT
|
||||
}};
|
||||
|
||||
inline const PixelFormatInfo GetPixelFormatInfo(VideoCore::Surface::PixelFormat pixel_format) {
|
||||
ASSERT(static_cast<size_t>(pixel_format) < FORMAT_TABLE.size());
|
||||
|
||||
return FORMAT_TABLE[static_cast<size_t>(pixel_format)];
|
||||
}
|
||||
|
||||
inline u32 CeilDivide(u32 a, u32 b) {
|
||||
return (a + b - 1) / b;
|
||||
}
|
||||
|
||||
inline size_t GetTextureBytesPerRow(VideoCore::Surface::PixelFormat pixel_format,
|
||||
u32 texels_per_row) {
|
||||
const auto& format_info = GetPixelFormatInfo(pixel_format);
|
||||
|
||||
return CeilDivide(texels_per_row, format_info.block_texel_size.width) *
|
||||
format_info.bytes_per_block;
|
||||
}
|
||||
|
||||
} // namespace Metal::MaxwellToMTL
|
||||
|
|
|
|||
|
|
@ -78,10 +78,6 @@ StagingBufferRef StagingBufferPool::GetStreamBuffer(size_t size) {
|
|||
|
||||
StagingBufferRef StagingBufferPool::GetStagingBuffer(size_t size, MemoryUsage usage,
|
||||
bool deferred) {
|
||||
if (const std::optional<StagingBufferRef> ref = TryGetReservedBuffer(size, usage, deferred)) {
|
||||
return *ref;
|
||||
}
|
||||
|
||||
return CreateStagingBuffer(size, usage, deferred);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info, GPUVAddr gpu_
|
|||
VAddr cpu_addr_)
|
||||
: VideoCommon::ImageBase(info, gpu_addr_, cpu_addr_), runtime{&runtime_} {
|
||||
MTL::TextureDescriptor* texture_descriptor = MTL::TextureDescriptor::alloc()->init();
|
||||
texture_descriptor->setPixelFormat(MaxwellToMTL::GetPixelFormat(info.format));
|
||||
texture_descriptor->setPixelFormat(MaxwellToMTL::GetPixelFormatInfo(info.format).pixel_format);
|
||||
texture_descriptor->setWidth(info.size.width);
|
||||
texture_descriptor->setHeight(info.size.height);
|
||||
texture_descriptor->setDepth(info.size.depth);
|
||||
|
|
@ -82,9 +82,7 @@ Image::~Image() {
|
|||
void Image::UploadMemory(MTL::Buffer* buffer, size_t offset,
|
||||
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||
for (const VideoCommon::BufferImageCopy& copy : copies) {
|
||||
// TODO: query this from texture format
|
||||
size_t bytes_per_pixel = 4;
|
||||
size_t bytes_per_row = info.size.width * bytes_per_pixel;
|
||||
size_t bytes_per_row = MaxwellToMTL::GetTextureBytesPerRow(info.format, info.size.width);
|
||||
size_t bytes_per_image = info.size.height * bytes_per_row;
|
||||
MTL::Size size = MTL::Size::Make(info.size.width, info.size.height, 1);
|
||||
MTL::Origin origin = MTL::Origin::Make(copy.image_offset.x, copy.image_offset.y,
|
||||
|
|
|
|||
Loading…
Reference in a new issue