From 94c1b74a170a37375ff6a6777285d5de828d304d Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Mon, 17 Jul 2017 19:52:14 +0300
Subject: [PATCH] fix build; restore asmjit reader_lock for now

---
 rpcs3/CMakeLists.txt                 | 3 ++-
 rpcs3/Emu/Cell/SPUAnalyser.cpp       | 4 ++--
 rpcs3/Emu/RSX/Common/surface_store.h | 6 +++---
 rpcs3/Emu/RSX/VK/VKGSRender.cpp      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index c216a4d471..76c2fa509c 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -283,6 +283,7 @@ endif()
 # Ignore autogenerated moc_* files if present
 set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
 set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
+set (EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp")
 
 foreach (TMP_PATH ${RPCS3_SRC})
 	foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
@@ -294,7 +295,7 @@ foreach (TMP_PATH ${RPCS3_SRC})
 endforeach(TMP_PATH)
 
 # Remove the Qt moc files as part of clean, they are compiled when generating automoc
-file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp")
+file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp" "${RPCS3_SRC_DIR}/qrc_resources.cpp")
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}")
 
 if (WIN32)
diff --git a/rpcs3/Emu/Cell/SPUAnalyser.cpp b/rpcs3/Emu/Cell/SPUAnalyser.cpp
index 2ff0389809..d370d9f7a8 100644
--- a/rpcs3/Emu/Cell/SPUAnalyser.cpp
+++ b/rpcs3/Emu/Cell/SPUAnalyser.cpp
@@ -62,7 +62,7 @@ std::shared_ptr<spu_function_t> SPUDatabase::analyse(const be_t<u32>* ls, u32 en
 	const u32 block_sz = max_limit - entry;
 
 	{
-		//reader_lock lock(m_mutex);
+		reader_lock lock(m_mutex);
 
 		// Try to find existing function in the database
 		if (auto func = find(base, key, block_sz))
@@ -101,7 +101,7 @@ std::shared_ptr<spu_function_t> SPUDatabase::analyse(const be_t<u32>* ls, u32 en
 		const auto type = s_spu_itype.decode(op.opcode);
 
 		{
-			//reader_lock lock(m_mutex);
+			reader_lock lock(m_mutex);
 
 			// Find existing function
 			if (pos != entry && find(ls + pos / 4, pos | u64{ op.opcode } << 32, limit - pos))
diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 65598343fa..ed23883647 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -114,7 +114,7 @@ namespace rsx
 			}
 
 			//Search invalidated resources for a suitable surface
-			for (auto &It = invalidated_resources.begin(); It != invalidated_resources.end(); It++)
+			for (auto It = invalidated_resources.begin(); It != invalidated_resources.end(); It++)
 			{
 				auto &rtt = *It;
 				if (Traits::rtt_has_format_width_height(rtt, color_format, width, height))
@@ -178,7 +178,7 @@ namespace rsx
 			}
 
 			//Search invalidated resources for a suitable surface
-			for (auto &It = invalidated_resources.begin(); It != invalidated_resources.end(); It++)
+			for (auto It = invalidated_resources.begin(); It != invalidated_resources.end(); It++)
 			{
 				auto &ds = *It;
 				if (Traits::ds_has_format_width_height(ds, depth_format, width, height))
@@ -438,4 +438,4 @@ namespace rsx
 				Traits::invalidate_depth_surface_contents(command_list, Traits::get(std::get<1>(ds)), true);
 		}
 	};
-}
\ No newline at end of file
+}
diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
index 74efb0d482..38b13db484 100644
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@@ -2188,7 +2188,7 @@ void VKGSRender::flip(int buffer)
 			size_t idx = vk::get_render_pass_location(m_swap_chain->get_surface_format(), VK_FORMAT_UNDEFINED, 1);
 			VkRenderPass single_target_pass = m_render_passes[idx];
 
-			for (auto &It = m_framebuffer_to_clean.begin(); It != m_framebuffer_to_clean.end(); It++)
+			for (auto It = m_framebuffer_to_clean.begin(); It != m_framebuffer_to_clean.end(); It++)
 			{
 				auto &fbo = *It;
 				if (fbo->attachments[0]->info.image == target_image)