mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-09 17:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix build; restore asmjit reader_lock for now

Browse source
This commit is contained in:
kd-11 2017-07-17 19:52:14 +03:00
commit 94c1b74a17
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/CMakeLists.txt
View file

@ -283,6 +283,7 @@ endif()
# Ignore autogenerated moc_* files if present # Ignore autogenerated moc_* files if present
set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_") set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc") set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
set (EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp")
foreach (TMP_PATH ${RPCS3_SRC}) foreach (TMP_PATH ${RPCS3_SRC})
foreach (EXCLUDE_PATH ${EXCLUDE_FILES}) foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
@ -294,7 +295,7 @@ foreach (TMP_PATH ${RPCS3_SRC})
endforeach(TMP_PATH) endforeach(TMP_PATH)
# Remove the Qt moc files as part of clean, they are compiled when generating automoc # 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}") set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}")
if (WIN32) if (WIN32)

4
rpcs3/Emu/Cell/SPUAnalyser.cpp
View file

@ -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; 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 // Try to find existing function in the database
if (auto func = find(base, key, block_sz)) 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); const auto type = s_spu_itype.decode(op.opcode);
{ {
//reader_lock lock(m_mutex); reader_lock lock(m_mutex);
// Find existing function // Find existing function
if (pos != entry && find(ls + pos / 4, pos | u64{ op.opcode } << 32, limit - pos)) if (pos != entry && find(ls + pos / 4, pos | u64{ op.opcode } << 32, limit - pos))

4
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -114,7 +114,7 @@ namespace rsx
} }
//Search invalidated resources for a suitable surface //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; auto &rtt = *It;
if (Traits::rtt_has_format_width_height(rtt, color_format, width, height)) 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 //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; auto &ds = *It;
if (Traits::ds_has_format_width_height(ds, depth_format, width, height)) if (Traits::ds_has_format_width_height(ds, depth_format, width, height))

2
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -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); 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]; 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; auto &fbo = *It;
if (fbo->attachments[0]->info.image == target_image) if (fbo->attachments[0]->info.image == target_image)