зеркало из https://github.com/mozilla/gecko-dev.git
Bug 806094 - Remove USE_ANGLE - r=jgilbert
This commit is contained in:
Родитель
5508716943
Коммит
0e7092f9e5
|
@ -63,9 +63,6 @@ CPPSRCS += \
|
|||
WebGLUniformLocation.cpp \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += -DUSE_ANGLE
|
||||
USE_ANGLE=1
|
||||
|
||||
LOCAL_INCLUDES += \
|
||||
-I$(topsrcdir)/js/xpconnect/wrappers \
|
||||
$(NULL)
|
||||
|
|
|
@ -4134,7 +4134,6 @@ WebGLContext::CompileShader(WebGLShader *shader)
|
|||
ShShaderOutput targetShaderSourceLanguage = gl->IsGLES2() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT;
|
||||
bool useShaderSourceTranslation = true;
|
||||
|
||||
#if defined(USE_ANGLE)
|
||||
if (shader->NeedsTranslation() && mShaderValidation) {
|
||||
ShHandle compiler = 0;
|
||||
ShBuiltInResources resources;
|
||||
|
@ -4303,7 +4302,6 @@ WebGLContext::CompileShader(WebGLShader *shader)
|
|||
gl->fGetShaderiv(shadername, LOCAL_GL_COMPILE_STATUS, &ok);
|
||||
shader->SetCompileStatus(ok);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -11,9 +11,7 @@
|
|||
|
||||
#include "jsfriendapi.h"
|
||||
|
||||
#if defined(USE_ANGLE)
|
||||
#include "angle/ShaderLang.h"
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -1001,7 +999,6 @@ WebGLContext::InitAndValidateGL()
|
|||
mShaderValidation =
|
||||
Preferences::GetBool("webgl.shader_validator", mShaderValidation);
|
||||
|
||||
#if defined(USE_ANGLE)
|
||||
// initialize shader translator
|
||||
if (mShaderValidation) {
|
||||
if (!ShInitialize()) {
|
||||
|
@ -1009,7 +1006,6 @@ WebGLContext::InitAndValidateGL()
|
|||
return false;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Mesa can only be detected with the GL_VERSION string, of the form "2.1 Mesa 7.11.0"
|
||||
mIsMesa = strstr((const char *)(gl->fGetString(LOCAL_GL_VERSION)), "Mesa");
|
||||
|
|
Загрузка…
Ссылка в новой задаче