diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java index bc30b4a19..dc155e19b 100644 --- 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 index 4836567f1..7e341efa8 100644 --- 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 index b8e258521..dbde13cbe 100644 --- a/app/src/main/res/values/non_L10n.xml +++ b/app/src/main/res/values/non_L10n.xml @@ -24,7 +24,7 @@ settings_env settings_pointer_color settings_scroll_direction - settings_gfx_msaa + settings_gfx_msaa_v2 settings_audio settings_voice_search_language settings_display_language diff --git a/versions.gradle b/versions.gradle index 11421af31..59d941a84 100644 --- 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.