mirror of
https://git.suyu.dev/suyu/suyu.git
synced 2024-11-26 13:26:30 -05:00
metal: create texture cache in rasterizer
This commit is contained in:
parent
ea5dc91b9d
commit
82b3fcca18
6 changed files with 198 additions and 85 deletions
|
@ -3,10 +3,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
#include "mtl_texture_cache.h"
|
||||||
#include "video_core/control/channel_state_cache.h"
|
#include "video_core/control/channel_state_cache.h"
|
||||||
#include "video_core/engines/maxwell_dma.h"
|
#include "video_core/engines/maxwell_dma.h"
|
||||||
#include "video_core/rasterizer_interface.h"
|
#include "video_core/rasterizer_interface.h"
|
||||||
#include "video_core/renderer_metal/objc_bridge.h"
|
#include "video_core/renderer_metal/mtl_texture_cache.h"
|
||||||
|
|
||||||
namespace Core {
|
namespace Core {
|
||||||
class System;
|
class System;
|
||||||
|
@ -17,6 +18,7 @@ namespace Metal {
|
||||||
class Device;
|
class Device;
|
||||||
class CommandRecorder;
|
class CommandRecorder;
|
||||||
class SwapChain;
|
class SwapChain;
|
||||||
|
class TextureCacheRuntime;
|
||||||
|
|
||||||
class RasterizerMetal;
|
class RasterizerMetal;
|
||||||
|
|
||||||
|
@ -38,8 +40,9 @@ public:
|
||||||
class RasterizerMetal final : public VideoCore::RasterizerInterface,
|
class RasterizerMetal final : public VideoCore::RasterizerInterface,
|
||||||
protected VideoCommon::ChannelSetupCaches<VideoCommon::ChannelInfo> {
|
protected VideoCommon::ChannelSetupCaches<VideoCommon::ChannelInfo> {
|
||||||
public:
|
public:
|
||||||
explicit RasterizerMetal(Tegra::GPU& gpu_, const Device& device_,
|
explicit RasterizerMetal(Tegra::GPU& gpu_, Tegra::MaxwellDeviceMemoryManager& device_memory_,
|
||||||
CommandRecorder& command_recorder_, const SwapChain& swap_chain_);
|
const Device& device_, CommandRecorder& command_recorder_,
|
||||||
|
const SwapChain& swap_chain_);
|
||||||
~RasterizerMetal() override;
|
~RasterizerMetal() override;
|
||||||
|
|
||||||
void Draw(bool is_indexed, u32 instance_count) override;
|
void Draw(bool is_indexed, u32 instance_count) override;
|
||||||
|
@ -91,10 +94,15 @@ public:
|
||||||
private:
|
private:
|
||||||
Tegra::GPU& gpu;
|
Tegra::GPU& gpu;
|
||||||
AccelerateDMA accelerate_dma;
|
AccelerateDMA accelerate_dma;
|
||||||
|
Tegra::MaxwellDeviceMemoryManager& device_memory;
|
||||||
|
|
||||||
const Device& device;
|
const Device& device;
|
||||||
CommandRecorder& command_recorder;
|
CommandRecorder& command_recorder;
|
||||||
const SwapChain& swap_chain;
|
const SwapChain& swap_chain;
|
||||||
|
|
||||||
|
StagingBufferPool staging_buffer_pool;
|
||||||
|
TextureCacheRuntime texture_cache_runtime;
|
||||||
|
TextureCache texture_cache;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Metal
|
} // namespace Metal
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#include "video_core/renderer_metal/mtl_command_recorder.h"
|
#include "video_core/renderer_metal/mtl_command_recorder.h"
|
||||||
#include "video_core/renderer_metal/mtl_device.h"
|
#include "video_core/renderer_metal/mtl_device.h"
|
||||||
#include "video_core/renderer_metal/mtl_rasterizer.h"
|
#include "video_core/renderer_metal/mtl_rasterizer.h"
|
||||||
|
#include "video_core/texture_cache/texture_cache_base.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -25,9 +26,15 @@ bool AccelerateDMA::BufferClear(GPUVAddr src_address, u64 amount, u32 value) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
RasterizerMetal::RasterizerMetal(Tegra::GPU& gpu_, const Device& device_,
|
RasterizerMetal::RasterizerMetal(Tegra::GPU& gpu_,
|
||||||
CommandRecorder& command_recorder_, const SwapChain& swap_chain_)
|
Tegra::MaxwellDeviceMemoryManager& device_memory_,
|
||||||
: gpu{gpu_}, device{device_}, command_recorder{command_recorder_}, swap_chain{swap_chain_} {}
|
const Device& device_, CommandRecorder& command_recorder_,
|
||||||
|
const SwapChain& swap_chain_)
|
||||||
|
: gpu{gpu_}, device_memory{device_memory_}, device{device_},
|
||||||
|
command_recorder{command_recorder_}, swap_chain{swap_chain_},
|
||||||
|
staging_buffer_pool(device, command_recorder),
|
||||||
|
texture_cache_runtime(device, command_recorder, staging_buffer_pool),
|
||||||
|
texture_cache(texture_cache_runtime, device_memory) {}
|
||||||
RasterizerMetal::~RasterizerMetal() = default;
|
RasterizerMetal::~RasterizerMetal() = default;
|
||||||
|
|
||||||
void RasterizerMetal::Draw(bool is_indexed, u32 instance_count) {
|
void RasterizerMetal::Draw(bool is_indexed, u32 instance_count) {
|
||||||
|
|
|
@ -42,7 +42,7 @@ constexpr size_t REGION_SIZE = STREAM_BUFFER_SIZE / StagingBufferPool::NUM_SYNCS
|
||||||
StagingBufferPool::StagingBufferPool(const Device& device_, CommandRecorder& command_recorder_)
|
StagingBufferPool::StagingBufferPool(const Device& device_, CommandRecorder& command_recorder_)
|
||||||
: device{device_}, command_recorder{command_recorder_} {
|
: device{device_}, command_recorder{command_recorder_} {
|
||||||
stream_buffer = [device.GetDevice() newBufferWithLength:STREAM_BUFFER_SIZE
|
stream_buffer = [device.GetDevice() newBufferWithLength:STREAM_BUFFER_SIZE
|
||||||
options:MTLResourceStorageModePrivate];
|
options:MTLResourceStorageModeShared];
|
||||||
}
|
}
|
||||||
|
|
||||||
StagingBufferPool::~StagingBufferPool() = default;
|
StagingBufferPool::~StagingBufferPool() = default;
|
||||||
|
@ -83,7 +83,7 @@ StagingBufferRef StagingBufferPool::CreateStagingBuffer(size_t size, MemoryUsage
|
||||||
bool deferred) {
|
bool deferred) {
|
||||||
const u32 log2 = Common::Log2Ceil64(size);
|
const u32 log2 = Common::Log2Ceil64(size);
|
||||||
MTLBuffer_t buffer = [device.GetDevice() newBufferWithLength:size
|
MTLBuffer_t buffer = [device.GetDevice() newBufferWithLength:size
|
||||||
options:MTLResourceStorageModePrivate];
|
options:MTLResourceStorageModeShared];
|
||||||
// TODO: check if the mapped span is correct
|
// TODO: check if the mapped span is correct
|
||||||
std::span<u8> mapped_span(static_cast<u8*>([buffer contents]), size);
|
std::span<u8> mapped_span(static_cast<u8*>([buffer contents]), size);
|
||||||
auto& entry = GetCache(usage)[log2].entries.emplace_back(buffer, mapped_span);
|
auto& entry = GetCache(usage)[log2].entries.emplace_back(buffer, mapped_span);
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
#include <span>
|
#include <span>
|
||||||
|
|
||||||
|
#include "mtl_staging_buffer_pool.h"
|
||||||
#include "video_core/texture_cache/texture_cache_base.h"
|
#include "video_core/texture_cache/texture_cache_base.h"
|
||||||
|
|
||||||
#include "shader_recompiler/shader_info.h"
|
#include "shader_recompiler/shader_info.h"
|
||||||
|
@ -24,6 +25,7 @@ using VideoCommon::Region2D;
|
||||||
using VideoCommon::RenderTargets;
|
using VideoCommon::RenderTargets;
|
||||||
using VideoCore::Surface::PixelFormat;
|
using VideoCore::Surface::PixelFormat;
|
||||||
|
|
||||||
|
class CommandRecorder;
|
||||||
class Device;
|
class Device;
|
||||||
class Image;
|
class Image;
|
||||||
class ImageView;
|
class ImageView;
|
||||||
|
@ -31,9 +33,13 @@ class Framebuffer;
|
||||||
|
|
||||||
class TextureCacheRuntime {
|
class TextureCacheRuntime {
|
||||||
public:
|
public:
|
||||||
explicit TextureCacheRuntime(const Device& device_);
|
explicit TextureCacheRuntime(const Device& device_, CommandRecorder& command_recorder_,
|
||||||
|
StagingBufferPool& staging_buffer_pool_);
|
||||||
|
|
||||||
void Finish();
|
// TODO: implement
|
||||||
|
void Finish() {}
|
||||||
|
|
||||||
|
void TickFrame();
|
||||||
|
|
||||||
StagingBufferRef UploadStagingBuffer(size_t size);
|
StagingBufferRef UploadStagingBuffer(size_t size);
|
||||||
|
|
||||||
|
@ -45,35 +51,49 @@ public:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void TickFrame();
|
u64 GetDeviceLocalMemory() const {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
u64 GetDeviceLocalMemory() const;
|
u64 GetDeviceMemoryUsage() const {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
u64 GetDeviceMemoryUsage() const;
|
bool CanReportMemoryUsage() const {
|
||||||
|
return false;
|
||||||
bool CanReportMemoryUsage() const;
|
}
|
||||||
|
|
||||||
|
// TODO: implement
|
||||||
void BlitImage(Framebuffer* dst_framebuffer, ImageView& dst, ImageView& src,
|
void BlitImage(Framebuffer* dst_framebuffer, ImageView& dst, ImageView& src,
|
||||||
const Region2D& dst_region, const Region2D& src_region,
|
const Region2D& dst_region, const Region2D& src_region,
|
||||||
Tegra::Engines::Fermi2D::Filter filter,
|
Tegra::Engines::Fermi2D::Filter filter,
|
||||||
Tegra::Engines::Fermi2D::Operation operation);
|
Tegra::Engines::Fermi2D::Operation operation) {}
|
||||||
|
|
||||||
void CopyImage(Image& dst, Image& src, std::span<const VideoCommon::ImageCopy> copies);
|
// TODO: implement
|
||||||
|
void CopyImage(Image& dst, Image& src, std::span<const VideoCommon::ImageCopy> copies) {}
|
||||||
|
|
||||||
void CopyImageMSAA(Image& dst, Image& src, std::span<const VideoCommon::ImageCopy> copies);
|
// TODO: implement
|
||||||
|
void CopyImageMSAA(Image& dst, Image& src, std::span<const VideoCommon::ImageCopy> copies) {}
|
||||||
|
|
||||||
bool ShouldReinterpret(Image& dst, Image& src);
|
bool ShouldReinterpret(Image& dst, Image& src) {
|
||||||
|
// HACK
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void ReinterpretImage(Image& dst, Image& src, std::span<const VideoCommon::ImageCopy> copies);
|
// TODO: implement
|
||||||
|
void ReinterpretImage(Image& dst, Image& src, std::span<const VideoCommon::ImageCopy> copies) {}
|
||||||
|
|
||||||
void ConvertImage(Framebuffer* dst, ImageView& dst_view, ImageView& src_view);
|
// TODO: implement
|
||||||
|
void ConvertImage(Framebuffer* dst, ImageView& dst_view, ImageView& src_view) {}
|
||||||
|
|
||||||
void InsertUploadMemoryBarrier();
|
// TODO: implement
|
||||||
|
void InsertUploadMemoryBarrier() {}
|
||||||
|
|
||||||
void TransitionImageLayout(Image& image) {}
|
void TransitionImageLayout(Image& image) {}
|
||||||
|
|
||||||
|
// TODO: implement
|
||||||
void AccelerateImageUpload(Image&, const StagingBufferRef&,
|
void AccelerateImageUpload(Image&, const StagingBufferRef&,
|
||||||
std::span<const VideoCommon::SwizzleParameters>);
|
std::span<const VideoCommon::SwizzleParameters>) {}
|
||||||
|
|
||||||
bool HasNativeBgr() const noexcept {
|
bool HasNativeBgr() const noexcept {
|
||||||
return true;
|
return true;
|
||||||
|
@ -83,9 +103,12 @@ public:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BarrierFeedbackLoop();
|
// TODO: implement
|
||||||
|
void BarrierFeedbackLoop() {}
|
||||||
|
|
||||||
const Device& device;
|
const Device& device;
|
||||||
|
CommandRecorder& command_recorder;
|
||||||
|
StagingBufferPool& staging_buffer_pool;
|
||||||
const Settings::ResolutionScalingInfo& resolution;
|
const Settings::ResolutionScalingInfo& resolution;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -112,25 +135,39 @@ public:
|
||||||
void DownloadMemory(MTLBuffer_t buffer, size_t offset,
|
void DownloadMemory(MTLBuffer_t buffer, size_t offset,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies);
|
std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
|
|
||||||
|
// For some reason, this function cannot be defined in the .mm file since it would report
|
||||||
|
// undefined symbols
|
||||||
void DownloadMemory(std::span<MTLBuffer_t> buffers, std::span<size_t> offsets,
|
void DownloadMemory(std::span<MTLBuffer_t> buffers, std::span<size_t> offsets,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies);
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
// TODO: implement
|
||||||
|
}
|
||||||
|
|
||||||
void DownloadMemory(const StagingBufferRef& map,
|
void DownloadMemory(const StagingBufferRef& map,
|
||||||
std::span<const VideoCommon::BufferImageCopy> copies);
|
std::span<const VideoCommon::BufferImageCopy> copies);
|
||||||
|
|
||||||
bool IsRescaled() const;
|
bool IsRescaled() const {
|
||||||
|
return rescaled;
|
||||||
|
}
|
||||||
|
|
||||||
bool ScaleUp(bool ignore = false);
|
bool ScaleUp(bool ignore = false) {
|
||||||
|
// HACK
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool ScaleDown(bool ignore = false);
|
bool ScaleDown(bool ignore = false) {
|
||||||
|
// HACK
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
MTLTexture_t GetHandle() const noexcept {
|
MTLTexture_t GetHandle() const noexcept {
|
||||||
return texture;
|
return texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MTLTexture_t texture;
|
MTLTexture_t texture = nil;
|
||||||
bool initialized = false;
|
bool initialized = false;
|
||||||
|
|
||||||
|
bool rescaled = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
class ImageView : public VideoCommon::ImageViewBase {
|
class ImageView : public VideoCommon::ImageViewBase {
|
||||||
|
|
|
@ -33,11 +33,26 @@ using VideoCore::Surface::IsPixelFormatASTC;
|
||||||
using VideoCore::Surface::IsPixelFormatInteger;
|
using VideoCore::Surface::IsPixelFormatInteger;
|
||||||
using VideoCore::Surface::SurfaceType;
|
using VideoCore::Surface::SurfaceType;
|
||||||
|
|
||||||
TextureCacheRuntime::TextureCacheRuntime(const Device &device_)
|
TextureCacheRuntime::TextureCacheRuntime(const Device& device_, CommandRecorder& command_recorder_,
|
||||||
: device{device_}, resolution{Settings::values.resolution_info} {}
|
StagingBufferPool& staging_buffer_pool_)
|
||||||
|
: device{device_}, command_recorder{command_recorder_},
|
||||||
|
staging_buffer_pool{staging_buffer_pool_},
|
||||||
|
resolution{Settings::values.resolution_info} {}
|
||||||
|
|
||||||
void TextureCacheRuntime::TickFrame() {}
|
void TextureCacheRuntime::TickFrame() {}
|
||||||
|
|
||||||
|
StagingBufferRef TextureCacheRuntime::UploadStagingBuffer(size_t size) {
|
||||||
|
return staging_buffer_pool.Request(size, MemoryUsage::Upload);
|
||||||
|
}
|
||||||
|
|
||||||
|
StagingBufferRef TextureCacheRuntime::DownloadStagingBuffer(size_t size, bool deferred) {
|
||||||
|
return staging_buffer_pool.Request(size, MemoryUsage::Download, deferred);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TextureCacheRuntime::FreeDeferredStagingBuffer(StagingBufferRef& ref) {
|
||||||
|
staging_buffer_pool.FreeDeferred(ref);
|
||||||
|
}
|
||||||
|
|
||||||
Image::Image(TextureCacheRuntime& runtime, const ImageInfo& info,
|
Image::Image(TextureCacheRuntime& runtime, const ImageInfo& info,
|
||||||
GPUVAddr gpu_addr_, VAddr cpu_addr_)
|
GPUVAddr gpu_addr_, VAddr cpu_addr_)
|
||||||
: VideoCommon::ImageBase(info, gpu_addr_, cpu_addr_) {
|
: VideoCommon::ImageBase(info, gpu_addr_, cpu_addr_) {
|
||||||
|
@ -52,7 +67,42 @@ Image::Image(TextureCacheRuntime &runtime, const ImageInfo &info,
|
||||||
[runtime.device.GetDevice() newTextureWithDescriptor:texture_descriptor];
|
[runtime.device.GetDevice() newTextureWithDescriptor:texture_descriptor];
|
||||||
}
|
}
|
||||||
|
|
||||||
Image::~Image() { [texture release]; }
|
Image::Image(const VideoCommon::NullImageParams& params) : VideoCommon::ImageBase{params} {}
|
||||||
|
|
||||||
|
Image::~Image() {
|
||||||
|
if (texture) {
|
||||||
|
[texture release];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: implement these
|
||||||
|
void Image::UploadMemory(MTLBuffer_t buffer, size_t offset,
|
||||||
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Image::UploadMemory(const StagingBufferRef& map,
|
||||||
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Image::DownloadMemory(MTLBuffer_t buffer, size_t offset,
|
||||||
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: uncomment
|
||||||
|
/*
|
||||||
|
void Image::DownloadMemory(std::span<MTLBuffer_t> buffers, std::span<size_t> offsets,
|
||||||
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
void Image::DownloadMemory(const StagingBufferRef& map,
|
||||||
|
std::span<const VideoCommon::BufferImageCopy> copies) {
|
||||||
|
;
|
||||||
|
}
|
||||||
|
|
||||||
ImageView::ImageView(TextureCacheRuntime& runtime,
|
ImageView::ImageView(TextureCacheRuntime& runtime,
|
||||||
const VideoCommon::ImageViewInfo& info, ImageId image_id_,
|
const VideoCommon::ImageViewInfo& info, ImageId image_id_,
|
||||||
|
@ -72,6 +122,17 @@ ImageView::ImageView(TextureCacheRuntime &runtime,
|
||||||
// TODO: save slot images
|
// TODO: save slot images
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info,
|
||||||
|
const VideoCommon::ImageViewInfo& view_info, GPUVAddr gpu_addr_)
|
||||||
|
: VideoCommon::ImageViewBase{info, view_info, gpu_addr_} {
|
||||||
|
// TODO: implement
|
||||||
|
}
|
||||||
|
|
||||||
|
ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::NullImageViewParams& params)
|
||||||
|
: VideoCommon::ImageViewBase{params} {
|
||||||
|
// TODO: implement
|
||||||
|
}
|
||||||
|
|
||||||
ImageView::~ImageView() { [texture release]; }
|
ImageView::~ImageView() { [texture release]; }
|
||||||
|
|
||||||
Sampler::Sampler(TextureCacheRuntime& runtime,
|
Sampler::Sampler(TextureCacheRuntime& runtime,
|
||||||
|
|
|
@ -16,7 +16,7 @@ RendererMetal::RendererMetal(Core::Frontend::EmuWindow& emu_window,
|
||||||
command_recorder(device),
|
command_recorder(device),
|
||||||
swap_chain(device, command_recorder,
|
swap_chain(device, command_recorder,
|
||||||
static_cast<const CAMetalLayer*>(render_window.GetWindowInfo().render_surface)),
|
static_cast<const CAMetalLayer*>(render_window.GetWindowInfo().render_surface)),
|
||||||
rasterizer(gpu_, device, command_recorder, swap_chain) {}
|
rasterizer(gpu_, device_memory, device, command_recorder, swap_chain) {}
|
||||||
|
|
||||||
RendererMetal::~RendererMetal() = default;
|
RendererMetal::~RendererMetal() = default;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue