Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-11-24 17:07:26 +08:00
commit b47d46219f
19 changed files with 333 additions and 27 deletions

View file

@ -676,9 +676,11 @@ WebGLContext::CreateAndInitGL(bool forceEnabled,
std::vector<FailureReason>* const out_failReasons)
{
const gl::SurfaceCaps baseCaps = BaseCaps(mOptions, this);
gl::CreateContextFlags flags = gl::CreateContextFlags::NO_VALIDATION;
bool tryNativeGL = true;
bool tryANGLE = false;
gl::CreateContextFlags flags = gl::CreateContextFlags::NONE;
if (Preferences::GetBool("webgl.gl_khr_no_validation", false)) {
flags |= gl::CreateContextFlags::NO_VALIDATION;
}
if (forceEnabled) {
flags |= gl::CreateContextFlags::FORCE_ENABLE_HARDWARE;
@ -694,6 +696,9 @@ WebGLContext::CreateAndInitGL(bool forceEnabled,
const bool useEGL = PR_GetEnv("MOZ_WEBGL_FORCE_EGL");
bool tryNativeGL = true;
bool tryANGLE = false;
#ifdef XP_WIN
tryNativeGL = false;
tryANGLE = true;