mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 15:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d12: Fix a potential race condition.

Browse Source
This commit is contained in:
vlj 2016-09-11 23:36:58 +02:00
parent 153f1cc50a
commit 30b804e0bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpcs3/Emu/RSX/D3D12/D3D12MemoryHelpers.cpp
View File

@ -23,6 +23,8 @@ void data_cache::protect_data(u64 key, u32 start, size_t size)
bool data_cache::invalidate_address(u32 addr) bool data_cache::invalidate_address(u32 addr)
{ {
// In case 2 threads write to texture memory
std::lock_guard<std::mutex> lock(m_mut);
bool handled = false; bool handled = false;
auto It = m_protected_ranges.begin(), E = m_protected_ranges.end(); auto It = m_protected_ranges.begin(), E = m_protected_ranges.end();
for (; It != E;) for (; It != E;)
@ -33,7 +35,6 @@ bool data_cache::invalidate_address(u32 addr)
u32 protectedRangeStart = std::get<1>(protectedTexture), protectedRangeSize = std::get<2>(protectedTexture); u32 protectedRangeStart = std::get<1>(protectedTexture), protectedRangeSize = std::get<2>(protectedTexture);
if (addr >= protectedRangeStart && addr <= protectedRangeSize + protectedRangeStart) if (addr >= protectedRangeStart && addr <= protectedRangeSize + protectedRangeStart)
{ {
std::lock_guard<std::mutex> lock(m_mut);
u64 texadrr = std::get<0>(protectedTexture); u64 texadrr = std::get<0>(protectedTexture);
m_address_to_data[texadrr].first.m_is_dirty = true; m_address_to_data[texadrr].first.m_is_dirty = true;