corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=585502; WebGL shader validation crash; r=bjacob

Browse Source
This commit is contained in:
Vladimir Vukicevic
2010-08-09 23:51:56 -07:00
parent ea22dde1b2
commit b46deb0d6b
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
content/canvas/src/WebGLContextValidate.cpp
View File

@@ -39,9 +39,12 @@
#include "WebGLContext.h"
#include "nsIPrefService.h"
#include "nsServiceManagerUtils.h"
#include "CheckedInt.h"
#if !defined(USE_GLES2) && defined(USE_ANGLE)
#if defined(USE_ANGLE)
#include "angle/ShaderLang.h"
#endif
@@ -444,17 +447,26 @@ WebGLContext::InitAndValidateGL()
gl->fEnable(LOCAL_GL_VERTEX_PROGRAM_POINT_SIZE);
}
#if !defined(USE_GLES2) && defined(USE_ANGLE)
// initialize shader translator
static bool didTranslatorInit = false;
if (!didTranslatorInit && mShaderValidation) {
if (!ShInitialize()) {
LogMessage("GLSL translator initialization failed!");
return PR_FALSE;
static bool didTranslatorCheck = false;
if (!didTranslatorCheck) {
// Check the shader validator pref
nsCOMPtr<nsIPrefBranch> prefService = do_GetService(NS_PREFSERVICE_CONTRACTID);
NS_ENSURE_TRUE(prefService != nsnull, NS_ERROR_FAILURE);
prefService->GetBoolPref("webgl.shader_validator", &mShaderValidation);
#if defined(USE_ANGLE)
// initialize shader translator
if (mShaderValidation) {
if (!ShInitialize()) {
LogMessage("GLSL translator initialization failed!");
return PR_FALSE;
}
}
didTranslatorInit = true;
}
#endif
didTranslatorCheck = true;
}
return PR_TRUE;
}