Skip to content

Fix crash when a texture file fails to load on an async worker thread #116

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

Open
scottsheppeard wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −0
Open

Fix crash when a texture file fails to load on an async worker thread #116

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
10 changes: 10 additions & 0 deletions engine/render/r_texture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,16 @@ void r_tex_c::LoadFile()

auto raw = std::make_unique<image_c>();
raw->CopyRaw(IMGTYPE_GRAY, 8, 8, t_defaultTexture);
if (flags & TF_ASYNC) {
// Missing/failed file on an async worker thread: the GL context
// belongs to the main thread, so route the placeholder upload
// through the pending-upload queue like the success path above.
img = std::move(raw);
flags = TF_NOMIPMAP;
status = PENDING_UPLOAD;
manager->EnqueueTextureUpload(this);
return;
}
Upload(*raw, TF_NOMIPMAP);
status = DONE;
}
Expand Down