Fix incorrect streamout buffer index in GS + refactor various code (#258)

src/Cafe/CafeSystem.cpp

@@ -577,7 +577,7 @@ namespace CafeSystem
 					const auto file = fsc_open(rpxPath.c_str(), FSC_ACCESS_FLAG::OPEN_FILE | FSC_ACCESS_FLAG::READ_PERMISSION, &status);
 					if (file)
 					{
-						_pathToExecutable = rpxPath;
+						_pathToExecutable = std::move(rpxPath);
 						fsc_close(file);
 					}
 				}

src/Cafe/Filesystem/fsc.cpp

@@ -143,7 +143,7 @@ sint32 fsc_mount(std::string_view mountPath, std::string_view targetPath, fscDev
 	}
 	node->device = fscDevice;
 	node->ctx = ctx;
-	node->deviceTargetPath = targetPathWithSlash;
+	node->deviceTargetPath = std::move(targetPathWithSlash);
 	fscLeave();
 	return FSC_STATUS_OK;
 }

src/Cafe/GraphicPack/GraphicPack2.cpp

@@ -1020,9 +1020,9 @@ bool GraphicPack2::Deactivate()
 	m_upscaling_shader_ud.reset();
 	m_downscaling_shader_ud.reset();
 
-	m_output_shader_source = "";
-	m_upscaling_shader_source = "";
-	m_downscaling_shader_source = "";
+	m_output_shader_source.clear();
+	m_upscaling_shader_source.clear();
+	m_downscaling_shader_source.clear();
 	
 	if (HasCustomVSyncFrequency())
 	{

src/Cafe/HW/Espresso/EspressoISA.h

@@ -101,7 +101,7 @@ namespace Espresso
 
 	struct BOField 
 	{
-		BOField() {};
+		BOField() = default;
 		BOField(uint8 bo) : bo(bo) {};
 
 		bool conditionInverted() const

src/Cafe/HW/Espresso/Recompiler/PPCFunctionBoundaryTracker.h

@@ -10,7 +10,7 @@ class PPCFunctionBoundaryTracker
 public:
 	struct PPCRange_t
 	{
-		PPCRange_t() {};
+		PPCRange_t() = default;
 		PPCRange_t(uint32 _startAddress) : startAddress(_startAddress) {};
 
 		uint32 startAddress{};

src/Cafe/HW/Espresso/Recompiler/PPCRecompiler.h

@@ -197,7 +197,7 @@ struct raLivenessLocation_t
 	bool isRead;
 	bool isWrite;
 
-	raLivenessLocation_t() {};
+	raLivenessLocation_t() = default;
 
 	raLivenessLocation_t(sint32 index, bool isRead, bool isWrite)
 		: index(index), isRead(isRead), isWrite(isWrite) {};

src/Cafe/HW/Latte/Core/LatteBufferCache.cpp

@@ -29,7 +29,7 @@ class IntervalTree2
 
 	struct InternalRange
 	{
-		InternalRange() {};
+		InternalRange() = default;
 		InternalRange(TRangeData _rangeBegin, TRangeData _rangeEnd) : rangeBegin(_rangeBegin), rangeEnd(_rangeEnd) { cemu_assert_debug(_rangeBegin < _rangeEnd); };
 
 		TRangeData rangeBegin;

src/Cafe/HW/Latte/Core/LatteGSCopyShaderParser.cpp

@@ -208,7 +208,7 @@ LatteParsedGSCopyShader* LatteGSCopyShaderParser_parse(uint8* programData, uint3
 				uint32 bufferIndex;
 				if (cf_inst23_7 == GPU7_CF_INST_MEM_STREAM0_WRITE)
 					bufferIndex = 0;
-				else if (cf_inst23_7 == GPU7_CF_INST_MEM_STREAM0_WRITE)
+				else if (cf_inst23_7 == GPU7_CF_INST_MEM_STREAM1_WRITE)
 					bufferIndex = 1;
 				else
 					cemu_assert_debug(false);

src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp

@@ -493,17 +493,18 @@ bool LatteMRT::UpdateCurrentFBO()
 
 		sint32 colorAttachmentWidth;
 		sint32 colorAttachmentHeight;
+
 		LatteTexture_getSize(colorAttachmentView->baseTexture, &colorAttachmentWidth, &colorAttachmentHeight, nullptr, colorAttachmentView->firstMip);
 
 		// set effective size
 		sint32 effectiveWidth, effectiveHeight;
 		LatteTexture_getEffectiveSize(colorAttachmentView->baseTexture, &effectiveWidth, &effectiveHeight, nullptr, colorAttachmentView->firstMip);
-		if( rtEffectiveSize->width == 0 && rtEffectiveSize->height == 0 )
+		if (rtEffectiveSize->width == 0 && rtEffectiveSize->height == 0)
 		{
 			rtEffectiveSize->width = effectiveWidth;
 			rtEffectiveSize->height = effectiveHeight;
 		}
-		else if( rtEffectiveSize->width != effectiveWidth && rtEffectiveSize->height != effectiveHeight )
+		else if (rtEffectiveSize->width != effectiveWidth && rtEffectiveSize->height != effectiveHeight)
 		{
 #ifndef PUBLIC_RELEASE
 			forceLog_printf("Color buffer size mismatch (%dx%d). Effective size: %dx%d Real size: %dx%d Mismatching texture: %08x %dx%d fmt %04x", rtEffectiveSize->width, rtEffectiveSize->height, effectiveWidth, effectiveHeight, colorAttachmentView->baseTexture->width, colorAttachmentView->baseTexture->height, colorAttachmentView->baseTexture->physAddress, colorAttachmentView->baseTexture->width, colorAttachmentView->baseTexture->height, (uint32)colorAttachmentView->baseTexture->format);

src/Cafe/HW/Latte/Core/LatteShaderCache.cpp

@@ -609,7 +609,7 @@ void LatteShaderCache_loadOrCompileSeparableShader(LatteDecompilerShader* shader
 
 bool LatteShaderCache_readSeparableVertexShader(MemStreamReader& streamReader, uint8 version)
 {
-	std::unique_ptr<LatteContextRegister> lcr(new LatteContextRegister());
+	auto lcr = std::make_unique<LatteContextRegister>();
 	if (version != 1)
 		return false;
 	uint64 shaderBaseHash = streamReader.readBE<uint64>();
@@ -658,7 +658,7 @@ bool LatteShaderCache_readSeparableGeometryShader(MemStreamReader& streamReader,
 {
 	if (version != 1)
 		return false;
-	std::unique_ptr<LatteContextRegister> lcr(new LatteContextRegister());
+	auto lcr = std::make_unique<LatteContextRegister>();
 	uint64 shaderBaseHash = streamReader.readBE<uint64>();
 	uint64 shaderAuxHash = streamReader.readBE<uint64>();
 	uint32 vsRingParameterCount = streamReader.readBE<uint16>();
@@ -698,7 +698,7 @@ bool LatteShaderCache_readSeparablePixelShader(MemStreamReader& streamReader, ui
 {
 	if (version != 1)
 		return false;
-	std::unique_ptr<LatteContextRegister> lcr(new LatteContextRegister());
+	auto lcr = std::make_unique<LatteContextRegister>();
 	uint64 shaderBaseHash = streamReader.readBE<uint64>();
 	uint64 shaderAuxHash = streamReader.readBE<uint64>();
 	bool usesGeometryShader = streamReader.readBE<uint8>() != 0;

src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.cpp

@@ -214,6 +214,10 @@ void VulkanPipelineStableCache::LoadPipelineFromCache(std::span<uint8> fileData)
 	if (!DeserializePipeline(streamReader, *cachedPipeline))
 	{
 		// failed to deserialize
+		s_spinlockSharedInternal.acquire();
+		delete lcr;
+		delete cachedPipeline;
+		s_spinlockSharedInternal.release();
 		return;
 	}
 	// restored register view from compacted state

src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineStableCache.h

@@ -3,7 +3,7 @@
 
 struct VulkanPipelineHash
 {
-	VulkanPipelineHash() {};
+	VulkanPipelineHash() = default;
 	VulkanPipelineHash(uint64 h0, uint64 h1) : h0(h0), h1(h1) {};
 
 	uint64 h0;

src/Cafe/OS/RPL/rpl.cpp

@@ -243,6 +243,7 @@ bool RPLLoader_ProcessHeaders(std::string_view moduleName, uint8* rplData, uint3
 	if (fileinfoSection->sectionSize < sizeof(RPLFileInfoData))
 	{
 		cemuLog_force("RPLLoader: FILEINFO section size is below expected size");
+		delete rplLoaderContext;
 		return false;
 	}
 
@@ -1963,7 +1964,7 @@ void RPLLoader_AddDependency(const char* name)
 	if (rplLoader_currentTlsModuleIndex == 0x7FFF)
 		cemuLog_force("RPLLoader: Exhausted TLS module indices pool");
 	// convert name to path/filename if it isn't already one
-	if (strstr(name, "."))
+	if (strchr(name, '.'))
 	{
 		strcpy_s(newDependency->filepath, name);
 	}

src/Cafe/OS/common/PPCConcurrentQueue.h

@@ -10,7 +10,7 @@ template <typename T>
 class PPCConcurrentQueue
 {
 public:
-	PPCConcurrentQueue() {}
+	PPCConcurrentQueue() = default;
 	PPCConcurrentQueue(const PPCConcurrentQueue&) = delete;
 	PPCConcurrentQueue& operator=(const PPCConcurrentQueue&) = delete;
 

src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp

@@ -54,9 +54,7 @@ namespace coreinit
 		{
 		}
 
-		~OSHostThread()
-		{
-		}
+		~OSHostThread() = default;
 
 		OSThread_t* m_thread;
 		Fiber m_fiber;
@@ -1223,7 +1221,7 @@ namespace coreinit
 	{
 		struct DeallocatorQueueEntry
 		{
-			DeallocatorQueueEntry() {};
+			DeallocatorQueueEntry() = default;
 			DeallocatorQueueEntry(OSThread_t* thread, MEMPTR<void> stack, MEMPTR<void> deallocatorFunc) : thread(thread), stack(stack), deallocatorFunc(deallocatorFunc) {};
 
 			OSThread_t* thread{};

src/Cafe/OS/libs/h264_avc/H264Dec.cpp

@@ -835,8 +835,11 @@ namespace H264
 		auto asyncTask = std::async(std::launch::async, _async_H264DECEnd, executeDoneEvent.GetPointer(), session, ctx, &results);
 		coreinit::OSWaitEvent(executeDoneEvent);
 		_ReleaseDecoderSession(session);
-		for (auto& itr : results)
-			H264DoFrameOutputCallback(ctx, itr);
+		if (!results.empty())
+		{
+			for (auto& itr : results)
+				H264DoFrameOutputCallback(ctx, itr);
+		}
 		return H264DEC_STATUS::SUCCESS;
 	}
 

src/Cafe/TitleList/MetaInfo.cpp

@@ -72,7 +72,6 @@ void MetaInfo::ParseDirectory(const fs::path& filename)
 
 bool MetaInfo::ParseFile(const fs::path& filename)
 {
-	const auto extension = filename.extension();
 	if (filename.filename() != "meta.xml")
 		return false;
 	

src/Cafe/TitleList/TitleInfo.cpp

@@ -287,7 +287,6 @@ void TitleInfo::CalcUID()
 		m_uid = 0;
 		return;
 	}
-	std::error_code ec;
 	// get absolute normalized path
 	fs::path normalizedPath;
 	if (m_fullPath.is_relative())

src/Cafe/TitleList/TitleList.cpp

@@ -78,9 +78,9 @@ void CafeTitleList::LoadCacheFile()
 		cacheEntry.titleVersion = titleVersion;
 		cacheEntry.titleDataFormat = format;
 		cacheEntry.region = region;
-		cacheEntry.titleName = name;
+		cacheEntry.titleName = std::move(name);
 		cacheEntry.path = _utf8ToPath(path);
-		cacheEntry.subPath = sub_path;
+		cacheEntry.subPath = std::move(sub_path);
 		cacheEntry.group_id = group_id;
 		cacheEntry.app_type = app_type;
 
@@ -482,7 +482,7 @@ void CafeTitleList::AddTitle(TitleInfo* titleInfo)
 		}
 	}
 	sTLList.emplace_back(titleInfo);
-	sTLMap.insert(std::pair(titleInfo->GetAppTitleId(), titleInfo));
+	sTLMap.emplace(titleInfo->GetAppTitleId(), titleInfo);
 	// send out notification
 	CafeTitleListCallbackEvent evt;
 	evt.eventType = CafeTitleListCallbackEvent::TYPE::TITLE_DISCOVERED;

src/Cemu/FileCache/FileCache.cpp

@@ -287,7 +287,10 @@ uint8* _fileCache_compressFileData(const uint8* fileData, uint32 fileSize, sint3
 	Bytef* compressedData = (Bytef*)malloc(4 + compressedLen);
 	int zret = compress2(compressedData + 4, &compressedLen, uncompressedInput, uncompressedLen, 4); // level 4 has good compression to performance ratio
 	if (zret != Z_OK)
+	{
+		free(compressedData);
 		return nullptr;
+	}
 	compressedData[0] = ((uint32)fileSize >> 24) & 0xFF;
 	compressedData[1] = ((uint32)fileSize >> 16) & 0xFF;
 	compressedData[2] = ((uint32)fileSize >> 8) & 0xFF;