b=779019; disable added assertion due to Mac issues

This commit is contained in:
Vladimir Vukicevic 2012-08-01 16:01:25 -04:00
parent beca46170b
commit 1c05aced00

View File

@ -595,12 +595,16 @@ public:
#ifdef DEBUG #ifdef DEBUG
PR_SetThreadPrivate(sCurrentGLContextTLS, this); PR_SetThreadPrivate(sCurrentGLContextTLS, this);
// XXX this assertion is disabled because it's triggering on Mac;
// we need to figure out why and reenable it.
#if 0
// IsOwningThreadCurrent is a bit of a misnomer; // IsOwningThreadCurrent is a bit of a misnomer;
// the "owning thread" is the creation thread, // the "owning thread" is the creation thread,
// and the only thread that can own this. We don't // and the only thread that can own this. We don't
// support contexts used on multiple threads. // support contexts used on multiple threads.
NS_ASSERTION(IsOwningThreadCurrent(), NS_ASSERTION(IsOwningThreadCurrent(),
"MakeCurrent() called on different thread than this context was created on!"); "MakeCurrent() called on different thread than this context was created on!");
#endif
#endif #endif
return MakeCurrentImpl(aForce); return MakeCurrentImpl(aForce);
} }