Skip to content

Fix macOS InstanceStorage upload wait hang in Gothic2Notr #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Crissorl wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −9
Draft

Fix macOS InstanceStorage upload wait hang in Gothic2Notr #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion game/game/compatibility/cpu32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void Cpu32::callFunction(ptr32_t func) {

std::string Cpu32::popString() {
if(stack.size()==0)
return 0;
return "";
auto ptr = stack.back();
stack.pop_back();

Expand Down
17 changes: 9 additions & 8 deletions game/graphics/instancestorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,10 @@ bool InstanceStorage::commit(Encoder<CommandBuffer>& cmd, uint8_t fId) {
}

void InstanceStorage::join() {
while(true) {
std::unique_lock<std::mutex> lck(sync);
if(uploadFId<0)
break;
}
std::unique_lock<std::mutex> lck(sync);
uploadCnd.wait(lck, [this] {
return uploadFId < 0;
});
}

InstanceStorage::Id InstanceStorage::alloc(const size_t size) {
Expand Down Expand Up @@ -307,13 +306,15 @@ void InstanceStorage::uploadMain() {
Workers::setThreadName("InstanceStorage upload");
while(true) {
std::unique_lock<std::mutex> lck(sync);
uploadCnd.wait(lck);
uploadCnd.wait(lck, [this] {
return uploadFId >= 0;
});
if(uploadFId==Resources::MaxFramesInFlight)
break;
if(uploadFId<0)
continue;

patchGpu[uploadFId].update(patchCpu);
uploadFId = -1;
lck.unlock();
uploadCnd.notify_all();
}
}