mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-25 13:17:18 +02:00
TextureCache: Fix OGL cleaning
This commit is contained in:
parent
282e04bffb
commit
978f598ff6
@ -1117,6 +1117,8 @@ ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info,
|
|||||||
ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::NullImageViewParams& params)
|
ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::NullImageViewParams& params)
|
||||||
: VideoCommon::ImageViewBase{params}, views{runtime.null_image_views} {}
|
: VideoCommon::ImageViewBase{params}, views{runtime.null_image_views} {}
|
||||||
|
|
||||||
|
ImageView::~ImageView() = default;
|
||||||
|
|
||||||
GLuint ImageView::StorageView(Shader::TextureType texture_type, Shader::ImageFormat image_format) {
|
GLuint ImageView::StorageView(Shader::TextureType texture_type, Shader::ImageFormat image_format) {
|
||||||
if (image_format == Shader::ImageFormat::Typeless) {
|
if (image_format == Shader::ImageFormat::Typeless) {
|
||||||
return Handle(texture_type);
|
return Handle(texture_type);
|
||||||
@ -1272,6 +1274,8 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Framebuffer::~Framebuffer() = default;
|
||||||
|
|
||||||
void BGRCopyPass::CopyBGR(Image& dst_image, Image& src_image,
|
void BGRCopyPass::CopyBGR(Image& dst_image, Image& src_image,
|
||||||
std::span<const VideoCommon::ImageCopy> copies) {
|
std::span<const VideoCommon::ImageCopy> copies) {
|
||||||
static constexpr VideoCommon::Offset3D zero_offset{0, 0, 0};
|
static constexpr VideoCommon::Offset3D zero_offset{0, 0, 0};
|
||||||
|
@ -232,6 +232,14 @@ public:
|
|||||||
const VideoCommon::ImageViewInfo& view_info);
|
const VideoCommon::ImageViewInfo& view_info);
|
||||||
explicit ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams&);
|
explicit ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams&);
|
||||||
|
|
||||||
|
~ImageView();
|
||||||
|
|
||||||
|
ImageView(const ImageView&) = delete;
|
||||||
|
ImageView& operator=(const ImageView&) = delete;
|
||||||
|
|
||||||
|
ImageView(ImageView&&) = default;
|
||||||
|
ImageView& operator=(ImageView&&) = default;
|
||||||
|
|
||||||
[[nodiscard]] GLuint StorageView(Shader::TextureType texture_type,
|
[[nodiscard]] GLuint StorageView(Shader::TextureType texture_type,
|
||||||
Shader::ImageFormat image_format);
|
Shader::ImageFormat image_format);
|
||||||
|
|
||||||
@ -300,6 +308,14 @@ public:
|
|||||||
explicit Framebuffer(TextureCacheRuntime&, std::span<ImageView*, NUM_RT> color_buffers,
|
explicit Framebuffer(TextureCacheRuntime&, std::span<ImageView*, NUM_RT> color_buffers,
|
||||||
ImageView* depth_buffer, const VideoCommon::RenderTargets& key);
|
ImageView* depth_buffer, const VideoCommon::RenderTargets& key);
|
||||||
|
|
||||||
|
~Framebuffer();
|
||||||
|
|
||||||
|
Framebuffer(const Framebuffer&) = delete;
|
||||||
|
Framebuffer& operator=(const Framebuffer&) = delete;
|
||||||
|
|
||||||
|
Framebuffer(Framebuffer&&) = default;
|
||||||
|
Framebuffer& operator=(Framebuffer&&) = default;
|
||||||
|
|
||||||
[[nodiscard]] GLuint Handle() const noexcept {
|
[[nodiscard]] GLuint Handle() const noexcept {
|
||||||
return framebuffer.handle;
|
return framebuffer.handle;
|
||||||
}
|
}
|
||||||
|
@ -1366,6 +1366,8 @@ ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::ImageInfo& info,
|
|||||||
ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams& params)
|
ImageView::ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams& params)
|
||||||
: VideoCommon::ImageViewBase{params} {}
|
: VideoCommon::ImageViewBase{params} {}
|
||||||
|
|
||||||
|
ImageView::~ImageView() = default;
|
||||||
|
|
||||||
VkImageView ImageView::DepthView() {
|
VkImageView ImageView::DepthView() {
|
||||||
if (depth_view) {
|
if (depth_view) {
|
||||||
return *depth_view;
|
return *depth_view;
|
||||||
@ -1492,6 +1494,8 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer,
|
|||||||
CreateFramebuffer(runtime, color_buffers, depth_buffer);
|
CreateFramebuffer(runtime, color_buffers, depth_buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Framebuffer::~Framebuffer() = default;
|
||||||
|
|
||||||
void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime,
|
void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime,
|
||||||
std::span<ImageView*, NUM_RT> color_buffers,
|
std::span<ImageView*, NUM_RT> color_buffers,
|
||||||
ImageView* depth_buffer) {
|
ImageView* depth_buffer) {
|
||||||
|
@ -162,6 +162,14 @@ public:
|
|||||||
const VideoCommon::ImageViewInfo&, GPUVAddr);
|
const VideoCommon::ImageViewInfo&, GPUVAddr);
|
||||||
explicit ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams&);
|
explicit ImageView(TextureCacheRuntime&, const VideoCommon::NullImageViewParams&);
|
||||||
|
|
||||||
|
~ImageView();
|
||||||
|
|
||||||
|
ImageView(const ImageView&) = delete;
|
||||||
|
ImageView& operator=(const ImageView&) = delete;
|
||||||
|
|
||||||
|
ImageView(ImageView&&) = default;
|
||||||
|
ImageView& operator=(ImageView&&) = default;
|
||||||
|
|
||||||
[[nodiscard]] VkImageView DepthView();
|
[[nodiscard]] VkImageView DepthView();
|
||||||
|
|
||||||
[[nodiscard]] VkImageView StencilView();
|
[[nodiscard]] VkImageView StencilView();
|
||||||
@ -235,6 +243,14 @@ public:
|
|||||||
explicit Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer,
|
explicit Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer,
|
||||||
ImageView* depth_buffer, VkExtent2D extent);
|
ImageView* depth_buffer, VkExtent2D extent);
|
||||||
|
|
||||||
|
~Framebuffer();
|
||||||
|
|
||||||
|
Framebuffer(const Framebuffer&) = delete;
|
||||||
|
Framebuffer& operator=(const Framebuffer&) = delete;
|
||||||
|
|
||||||
|
Framebuffer(Framebuffer&&) = default;
|
||||||
|
Framebuffer& operator=(Framebuffer&&) = default;
|
||||||
|
|
||||||
void CreateFramebuffer(TextureCacheRuntime& runtime,
|
void CreateFramebuffer(TextureCacheRuntime& runtime,
|
||||||
std::span<ImageView*, NUM_RT> color_buffers, ImageView* depth_buffer);
|
std::span<ImageView*, NUM_RT> color_buffers, ImageView* depth_buffer);
|
||||||
|
|
||||||
|
@ -1620,6 +1620,9 @@ void TextureCache<P>::RemoveFramebuffers(std::span<const ImageViewId> removed_vi
|
|||||||
auto it = framebuffers.begin();
|
auto it = framebuffers.begin();
|
||||||
while (it != framebuffers.end()) {
|
while (it != framebuffers.end()) {
|
||||||
if (it->first.Contains(removed_views)) {
|
if (it->first.Contains(removed_views)) {
|
||||||
|
auto framebuffer_id = it->second;
|
||||||
|
ASSERT(framebuffer_id);
|
||||||
|
sentenced_framebuffers.Push(std::move(slot_framebuffers[framebuffer_id]));
|
||||||
it = framebuffers.erase(it);
|
it = framebuffers.erase(it);
|
||||||
} else {
|
} else {
|
||||||
++it;
|
++it;
|
||||||
|
Loading…
Reference in New Issue
Block a user