Bug 727614 - Use #ifdef ANDROID instead of #ifdef MOZ_WIDGET_ANDROID to cover B2G too. r=joe
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 16 Feb 2012 18:45:16 -0500
changeset 87063 d2a3daf5c3c0fa8901b86802d37880fa1c61815f
parent 87062 6c2ded81da6a004398e06a00ec8ebc66d1c83dfe
child 87064 e0e35faac08c066da8a3bcb6ed2b01f10f1a1369
push id22071
push userbmo@edmorley.co.uk
push dateFri, 17 Feb 2012 11:08:28 +0000
treeherdermozilla-central@08e55f36b731 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoe
bugs727614
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 727614 - Use #ifdef ANDROID instead of #ifdef MOZ_WIDGET_ANDROID to cover B2G too. r=joe
content/canvas/src/WebGLContextGL.cpp
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -4372,17 +4372,17 @@ WebGLContext::CompileShader(nsIWebGLShad
 
         // notice that on Android, we always use SH_GLSL_OUTPUT, we never use the ESSL backend.
         // see bug 709947, the reason is that 1) we dont really need a ESSL backend since the
         // source is already ESSL, and 2) we ran into massive Android crashes when we used the ESSL backend.
         // But if we wanted to use shader transformations on ES platforms, we would have to use the
         // ESSL backend
         compiler = ShConstructCompiler((ShShaderType) shader->ShaderType(),
                                        SH_WEBGL_SPEC,
-#ifdef MOZ_WIDGET_ANDROID
+#ifdef ANDROID
                                        SH_GLSL_OUTPUT,
 #else
                                        gl->IsGLES2() ? SH_ESSL_OUTPUT : SH_GLSL_OUTPUT,
 #endif
                                        &resources);
 
         // We're storing an actual instance of StripComments because, if we don't, the 
         // cleanSource nsAString instance will be destroyed before the reference is