Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 749678 - 4/5 - check owning thread in debug builds - r=bgirard

Browse Source
This commit is contained in:
Benoit Jacob 2012-05-08 09:47:34 -04:00
parent f3194c19c8
commit fed31003d5
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/gl/GLContext.h
View File

@ -658,7 +658,30 @@ public:
virtual bool MakeCurrentImpl() = 0;
void CheckOwningThreadInDebugMode() {
#ifdef DEBUG
if (!NS_GetCurrentThread()) {
// happens during shutdown. Drop this check in that case.
return;
}
if (!IsOwningThreadCurrent())
{
printf_stderr(
"This GL context (%p) is owned by thread %p, but the current thread is %p. "
"That's fine by itself, but our current code in GLContext::MakeCurrent, checking "
"if the context is already current, relies on the assumption that GL calls on a given "
"GLContext are only made by the thread that created that GLContext. If you want to "
"start making GL calls from non-owning threads, you'll have to change a few things "
"around here, see Bug 749678 comments 13 and 15.\n",
this, mOwningThread.get(), NS_GetCurrentThread());
NS_ABORT();
}
#endif
}
bool MakeCurrent(bool aForce = false) {
CheckOwningThreadInDebugMode();
if (!aForce &&
this == CurrentGLContext())
{
@ -1879,6 +1902,7 @@ public:
if (DebugMode()) {
if (DebugMode() & DebugTrace)
printf_stderr("[gl:%p] > %s\n", this, glFunction);
CheckOwningThreadInDebugMode();
if (this != CurrentGLContext()) {
printf_stderr("Fatal: %s called on non-current context %p. "
"The current context for this thread is %p.\n",