hipnosuer
/
Zuma
forked from ShuriZma/suyu
1
0
Fork 0
Code Pull Requests Activity

metal: do not release null mtl textures

This commit is contained in:
Samuliak 2024-04-08 18:30:04 +02:00
parent 40eca20e12
commit 67dab8b8d8
No known key found for this signature in database
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video_core/renderer_metal/mtl_graphics_pipeline.cpp
View File

@ -15,6 +15,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/shader_notify.h" #include "video_core/shader_notify.h"
#include "video_core/texture_cache/texture_cache.h"
#include "video_core/texture_cache/texture_cache_base.h" #include "video_core/texture_cache/texture_cache_base.h"
namespace Metal { namespace Metal {

2
src/video_core/renderer_metal/mtl_pipeline_cache.cpp
View File

@ -266,7 +266,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
// HACK: dummy info // HACK: dummy info
std::array<const Shader::Info*, VideoCommon::NUM_STAGES> infos = {nullptr}; std::array<const Shader::Info*, VideoCommon::NUM_STAGES> infos = {nullptr};
infos[0] = new Shader::Info{}; infos[0] = new Shader::Info{};
infos[1] = new Shader::Info{}; infos[4] = new Shader::Info{};
return std::make_unique<GraphicsPipeline>(device, command_recorder, key, buffer_cache, return std::make_unique<GraphicsPipeline>(device, command_recorder, key, buffer_cache,
texture_cache, &shader_notify, functions, infos); texture_cache, &shader_notify, functions, infos);

10
src/video_core/renderer_metal/mtl_texture_cache.cpp
View File

@ -103,9 +103,9 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::ImageViewI
ImageId image_id_, Image& image) ImageId image_id_, Image& image)
: VideoCommon::ImageViewBase{info, image.info, image_id_, image.gpu_addr} { : VideoCommon::ImageViewBase{info, image.info, image_id_, image.gpu_addr} {
using Shader::TextureType; using Shader::TextureType;
// TODO: For whatever reason, some images's internal objc objects is NULL if (image.GetHandle()) {
// TODO: metal-cpp provides no method to check for this texture = image.GetHandle()->retain();
texture = image.GetHandle()->retain(); }
// TODO: create texture view // TODO: create texture view
} }
@ -128,7 +128,9 @@ ImageView::ImageView(TextureCacheRuntime& runtime, const VideoCommon::NullImageV
} }
ImageView::~ImageView() { ImageView::~ImageView() {
texture->release(); if (texture) {
texture->release();
}
} }
Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& tsc) { Sampler::Sampler(TextureCacheRuntime& runtime, const Tegra::Texture::TSCEntry& tsc) {