Bump GV to v77.0.20200428100141 (#3271)

MozillaReality · Apr 28, 2020 · 6ee1a8e · 6ee1a8e
1 parent aa509ac
commit 6ee1a8e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
@@ -84,7 +84,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
     public final static int POINTER_COLOR_DEFAULT_DEFAULT = Color.parseColor("#FFFFFF");
     public final static int SCROLL_DIRECTION_DEFAULT = 0;
     public final static String ENV_DEFAULT = "offworld";
-    public final static int MSAA_DEFAULT_LEVEL = 1;
+    public final static int MSAA_DEFAULT_LEVEL = 0;
     public final static boolean AUDIO_ENABLED = false;
     public final static float CYLINDER_DENSITY_ENABLED_DEFAULT = 4680.0f;
     private final static long CRASH_RESTART_DELTA = 2000;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionUtils.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionUtils.java
@@ -54,7 +54,10 @@ public static void vrPrefsWorkAround(Context aContext, Bundle aExtras) {
             int msaa = SettingsStore.getInstance(aContext).getMSAALevel();
             if (msaa > 0) {
                 int msaaLevel = msaa == 2 ? 4 : 2;
-                out.write(("pref(\"gl.msaa-level\"," + msaaLevel + ");\n").getBytes());
+                out.write(("pref(\"webgl.msaa-samples\"," + msaaLevel + ");\n").getBytes());
+                out.write("pref(\"webgl.msaa-force\", true);\n".getBytes());
+            } else {
+                out.write("pref(\"webgl.msaa-force\", false);\n".getBytes());
             }
             addOptionalPref(out, "dom.vr.require-gesture", aExtras);
             addOptionalPref(out, "privacy.reduceTimerPrecision", aExtras);

diff --git a/app/src/main/res/values/non_L10n.xml b/app/src/main/res/values/non_L10n.xml
@@ -24,7 +24,7 @@
     <string name="settings_key_env" translatable="false">settings_env</string>
     <string name="settings_key_pointer_color" translatable="false">settings_pointer_color</string>
     <string name="settings_key_scroll_direction" translatable="false">settings_scroll_direction</string>
-    <string name="settings_key_msaa" translatable="false">settings_gfx_msaa</string>
+    <string name="settings_key_msaa" translatable="false">settings_gfx_msaa_v2</string>
     <string name="settings_key_audio" translatable="false">settings_audio</string>
     <string name="settings_key_voice_search_language" translatable="false">settings_voice_search_language</string>
     <string name="settings_key_display_language" translatable="false">settings_display_language</string>

diff --git a/versions.gradle b/versions.gradle
@@ -24,7 +24,7 @@ ext.deps = [:]
 def versions = [:]
 // GeckoView versions can be found here:
 // https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
-versions.gecko_view = "77.0.20200422093542"
+versions.gecko_view = "77.0.20200428100141"
 versions.android_components = "28.0.1"
 // Note that android-components also depends on application-services,
 // and in fact is our main source of appservices-related functionality.