Enable Oculus Fixed Foveated Rendering with a value of 2 (0 = none, 3…

… = max).

app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java

@@ -575,6 +575,12 @@ public int getPointerColor() {
         return SettingsStore.getInstance(this).getPointerColor();
     }
 
+    @Keep
+    @SuppressWarnings("unused")
+    public int getFoveatedLevel() {
+        return SettingsStore.getInstance(this).getFoveatedLevel();
+    }
+
     void createOffscreenDisplay() {
         int[] ids = new int[1];
         GLES20.glGenTextures(1, ids, 0);
@@ -766,6 +772,11 @@ public void updateEnvironment() {
         queueRunnable(() -> updateEnvironmentNative());
     }
 
+    @Override
+    public void updateFoveatedLevel() {
+        queueRunnable(() -> updateFoveatedLevelNative());
+    }
+
     @Override
     public void updatePointerColor() {
         queueRunnable(() -> updatePointerColorNative());
@@ -806,4 +817,5 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
     private native void workaroundGeckoSigAction();
     private native void updateEnvironmentNative();
     private native void updatePointerColorNative();
+    private native void updateFoveatedLevelNative();
 }

app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java

@@ -50,6 +50,7 @@ SettingsStore getInstance(final @NonNull Context aContext) {
     public final static float BROWSER_WORLD_WIDTH_DEFAULT = 4.0f;
     public final static float BROWSER_WORLD_HEIGHT_DEFAULT = 2.25f;
     public final static int MSAA_DEFAULT_LEVEL = 1;
+    public final static int FOVEATED_DEFAULT_LEVEL = 2;
 
     // Enable telemetry by default (opt-out).
     private final static boolean enableCrashReportingByDefault = false;
@@ -304,4 +305,14 @@ public void setMSAALevel(int level) {
         editor.commit();
     }
 
+    public int getFoveatedLevel() {
+        return mPrefs.getInt(
+                mContext.getString(R.string.settings_key_foveated), FOVEATED_DEFAULT_LEVEL);
+    }
+
+    public void setFoveatedLevel(int level) {
+        SharedPreferences.Editor editor = mPrefs.edit();
+        editor.putInt(mContext.getString(R.string.settings_key_foveated), level);
+        editor.commit();
+    }
 }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/DeveloperOptionsWidget.java

@@ -41,6 +41,7 @@ public class DeveloperOptionsWidget extends UIWidget {
     private RadioGroupSetting mPointerColorRadio;
     private RadioGroupSetting mUaModeRadio;
     private RadioGroupSetting mMSAARadio;
+    private RadioGroupSetting mFoveatedRadio;
 
     private SingleEditSetting mDensityEdit;
     private SingleEditSetting mDpiEdit;
@@ -127,6 +128,15 @@ public void onClick(View view) {
         mMSAARadio.setOnCheckedChangeListener(mMSSAChangeListener);
         setMSAAMode(mMSAARadio.getIdForValue(msaaLevel), false);
 
+        int foveatedLevel = SettingsStore.getInstance(getContext()).getFoveatedLevel();
+        mFoveatedRadio = findViewById(R.id.foveated_radio);
+        if (!true) { // FINDME!! KIP!! HACK!!
+            mFoveatedRadio.setVisibility(View.GONE);
+        } else {
+            mFoveatedRadio.setOnCheckedChangeListener(mFoveatedChangeListener);
+            setFoveatedLevel(mFoveatedRadio.getIdForValue(foveatedLevel), false);
+        }
+
         mDensityEdit = findViewById(R.id.density_edit);
         mDensityEdit.setFirstText(Float.toString(SettingsStore.getInstance(getContext()).getDisplayDensity()));
         mDensityEdit.setOnClickListener(mDensityListener);
@@ -245,6 +255,13 @@ public void onCheckedChanged(RadioGroup radioGroup, int checkedId, boolean doApp
         }
     };
 
+    private RadioGroupSetting.OnCheckedChangeListener mFoveatedChangeListener = new RadioGroupSetting.OnCheckedChangeListener() {
+        @Override
+        public void onCheckedChanged(RadioGroup radioGroup, int checkedId, boolean doApply) {
+            setFoveatedLevel(checkedId, true);
+        }
+    };
+
     private RadioGroupSetting.OnCheckedChangeListener mEnvsListener = new RadioGroupSetting.OnCheckedChangeListener() {
         @Override
         public void onCheckedChanged(RadioGroup radioGroup, int checkedId, boolean doApply) {
@@ -414,6 +431,18 @@ private void setMSAAMode(int checkedId, boolean doApply) {
         }
     }
 
+    private void setFoveatedLevel(int checkedId, boolean doApply) {
+        mFoveatedRadio.setOnCheckedChangeListener(null);
+        mFoveatedRadio.setChecked(checkedId, doApply);
+        mFoveatedRadio.setOnCheckedChangeListener(mFoveatedChangeListener);
+
+        SettingsStore.getInstance(getContext()).setFoveatedLevel((Integer)mFoveatedRadio.getValueForId(checkedId));
+
+        if (doApply) {
+            mWidgetManager.updateFoveatedLevel();
+        }
+    }
+
     private void setEnv(int checkedId, boolean doApply) {
         mEnvironmentsRadio.setOnCheckedChangeListener(null);
         mEnvironmentsRadio.setChecked(checkedId, doApply);

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WidgetManagerDelegate.java

@@ -31,6 +31,7 @@ interface FocusChangeListener {
     void setBrowserSize(float targetWidth, float targetHeight);
     void keyboardDismissed();
     void updateEnvironment();
+    void updateFoveatedLevel();
     void updatePointerColor();
     void addFocusChangeListener(@NonNull FocusChangeListener aListener);
     void removeFocusChangeListener(@NonNull FocusChangeListener aListener);

app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp

@@ -440,6 +440,17 @@ DeviceDelegateGoogleVR::SetControllerDelegate(ControllerDelegatePtr& aController
   }
 }
 
+void
+DeviceDelegateGoogleVR::SetFoveatedLevel(const uint32_t aLevel) {
+  // Not Supported
+}
+
+int32_t
+DeviceDelegateGoogleVR::GetMaxFoveatedLevel() {
+  // Return 0 to indicate that it is not supported
+  return 0;
+}
+
 void
 DeviceDelegateGoogleVR::ReleaseControllerDelegate() {
   m.controllerDelegate = nullptr;

app/src/googlevr/cpp/DeviceDelegateGoogleVR.h

@@ -31,6 +31,8 @@ class DeviceDelegateGoogleVR : public DeviceDelegate {
   void SetClipPlanes(const float aNear, const float aFar) override;
   void SetControllerDelegate(ControllerDelegatePtr& aController) override;
   void ReleaseControllerDelegate() override;
+  void SetFoveatedLevel(const uint32_t aLevel) override;
+  int32_t GetMaxFoveatedLevel() override;
   int32_t GetControllerModelCount() const override;
   const std::string GetControllerModelName(const int32_t aModelIndex) const override;
   void ProcessEvents() override;

app/src/main/cpp/BrowserWorld.cpp

@@ -500,6 +500,7 @@ BrowserWorld::InitializeJava(JNIEnv* aEnv, jobject& aActivity, jobject& aAssetMa
     m.loadingAnimation->LoadModels(m.loader);
     m.rootController->AddNode(m.controllers->GetRoot());
     std::string skyboxPath = VRBrowser::GetActiveEnvironment();
+    m.device->SetFoveatedLevel(VRBrowser::GetFoveatedLevel());
     if (VRBrowser::isOverrideEnvPathEnabled()) {
       std::string storagePath = VRBrowser::GetStorageAbsolutePath(INJECT_SKYBOX_PATH);
       if (std::ifstream(storagePath)) {
@@ -646,6 +647,12 @@ BrowserWorld::UpdateEnvironment() {
   m.rootOpaqueParent->AddNode(m.skybox);
 }
 
+void
+BrowserWorld::UpdateFoveatedLevel() {
+  ASSERT_ON_RENDER_THREAD();
+  m.device->SetFoveatedLevel(VRBrowser::GetFoveatedLevel());
+}
+
 void
 BrowserWorld::UpdatePointerColor() {
   ASSERT_ON_RENDER_THREAD();
@@ -1191,6 +1198,11 @@ JNI_METHOD(void, updateEnvironmentNative)
   crow::BrowserWorld::Instance().UpdateEnvironment();
 }
 
+JNI_METHOD(void, updateFoveatedLevelNative)
+(JNIEnv* aEnv, jobject) {
+  crow::BrowserWorld::Instance().UpdateFoveatedLevel();
+}
+
 JNI_METHOD(void, updatePointerColorNative)
 (JNIEnv* aEnv, jobject) {
   crow::BrowserWorld::Instance().UpdatePointerColor();

app/src/main/cpp/BrowserWorld.h

@@ -38,6 +38,7 @@ class BrowserWorld {
   void Draw();
   void SetTemporaryFilePath(const std::string& aPath);
   void UpdateEnvironment();
+  void UpdateFoveatedLevel();
   void UpdatePointerColor();
   void SetSurfaceTexture(const std::string& aName, jobject& aSurface);
   void AddWidget(int32_t aHandle, const WidgetPlacementPtr& placement);

app/src/main/cpp/DeviceDelegate.h

@@ -48,6 +48,8 @@ class DeviceDelegate {
   virtual void SetClearColor(const vrb::Color& aColor) = 0;
   virtual void SetClipPlanes(const float aNear, const float aFar) = 0;
   virtual void SetControllerDelegate(ControllerDelegatePtr& aController) = 0;
+  virtual void SetFoveatedLevel(const uint32_t aLevel) = 0;
+  virtual int32_t GetMaxFoveatedLevel() = 0;
   virtual void ReleaseControllerDelegate() = 0;
   virtual int32_t GetControllerModelCount() const = 0;
   virtual const std::string GetControllerModelName(const int32_t aModelIndex) const = 0;

app/src/main/cpp/VRBrowser.cpp

@@ -38,7 +38,8 @@ static const char* kGetActiveEnvironment = "getActiveEnvironment";
 static const char* kGetActiveEnvironmentSignature = "()Ljava/lang/String;";
 static const char* kGetPointerColor = "getPointerColor";
 static const char* kGetPointerColorSignature = "()I";
-
+static const char* kGetFoveatedLevel = "getFoveatedLevel";
+static const char* kGetFoveatedLevelSignature = "()I";
 static JNIEnv* sEnv;
 static jobject sActivity;
 static jmethodID sDispatchCreateWidget;
@@ -55,6 +56,7 @@ static jmethodID sGetStorageAbsolutePath;
 static jmethodID sIsOverrideEnvPathEnabled;
 static jmethodID sGetActiveEnvironment;
 static jmethodID sGetPointerColor;
+static jmethodID sGetFoveatedLevel;
 }
 
 namespace crow {
@@ -88,6 +90,7 @@ VRBrowser::InitializeJava(JNIEnv* aEnv, jobject aActivity) {
   sIsOverrideEnvPathEnabled = FindJNIMethodID(sEnv, browserClass, kIsOverrideEnvPathEnabledName, kIsOverrideEnvPathEnabledSignature);
   sGetActiveEnvironment = FindJNIMethodID(sEnv, browserClass, kGetActiveEnvironment, kGetActiveEnvironmentSignature);
   sGetPointerColor = FindJNIMethodID(sEnv, browserClass, kGetPointerColor, kGetPointerColorSignature);
+  sGetFoveatedLevel = FindJNIMethodID(sEnv, browserClass, kGetFoveatedLevel, kGetFoveatedLevelSignature);
 }
 
 void
@@ -237,4 +240,13 @@ VRBrowser::GetPointerColor() {
   return (int32_t )jHexColor;
 }
 
+int32_t
+VRBrowser::GetFoveatedLevel() {
+  if (!ValidateMethodID(sEnv, sActivity, sGetFoveatedLevel, __FUNCTION__)) { return 16777215; }
+  jint jFoveatedLevel = (jint) sEnv->CallIntMethod(sActivity, sGetFoveatedLevel);
+  CheckJNIException(sEnv, __FUNCTION__);
+
+  return (int32_t )jFoveatedLevel;
+}
+
 } // namespace crow

app/src/main/cpp/VRBrowser.h

@@ -31,6 +31,7 @@ std::string GetStorageAbsolutePath(const std::string& aRelativePath);
 bool isOverrideEnvPathEnabled();
 std::string GetActiveEnvironment();
 int32_t GetPointerColor();
+int32_t GetFoveatedLevel();
 } // namespace VRBrowser;
 
 } // namespace crow

app/src/main/res/layout/developer_options.xml

@@ -97,6 +97,14 @@
                     app:options="@array/developer_options_msaa_options"
                     app:values="@array/developer_options_ua_mode_values"/>
 
+                <org.mozilla.vrbrowser.ui.settings.RadioGroupSetting
+                    android:id="@+id/foveated_radio"
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    app:description="@string/developer_options_foveated"
+                    app:options="@array/developer_options_foveated_options"
+                    app:values="@array/developer_options_ua_mode_values"/>
+
                 <org.mozilla.vrbrowser.ui.settings.SingleEditSetting
                     android:id="@+id/density_edit"
                     android:layout_width="match_parent"

app/src/main/res/values/non_L10n.xml

@@ -21,6 +21,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_msaa" translatable="false">settings_msaa</string>
+    <string name="settings_key_foveated" translatable="false">settings_foveated</string>
     <string name="private_browsing_support_url" translatable="false">https://support.mozilla.org/kb/private-mode-firefox-reality</string>
     <string name="settings_key_browser_world_width" translatable="false">settings_browser_world_width</string>
     <string name="settings_key_browser_world_height" translatable="false">settings_browser_world_height</string>
@@ -72,4 +73,10 @@
         <item>@string/developer_options_msaa_2</item>
         <item>@string/developer_options_msaa_4</item>
     </string-array>
+    <string-array name="developer_options_foveated_options" translatable="false">
+        <item>@string/developer_options_foveated_disabled</item>
+        <item>@string/developer_options_foveated_1</item>
+        <item>@string/developer_options_foveated_2</item>
+        <item>@string/developer_options_foveated_3</item>
+    </string-array>
 </resources>

app/src/main/res/values/settings_values.xml

@@ -13,5 +13,6 @@
         <item>0</item>
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </integer-array>
 </resources>

app/src/main/res/values/strings.xml

@@ -102,6 +102,16 @@
     <string name="developer_options_msaa_2">2x</string>
     <!-- This string is used to label the MSAA radio button that enables four times MSAA in immersive mode. -->
     <string name="developer_options_msaa_4">4x</string>
+    <!-- This string is used to label radio buttons for setting fixed-foveated-rendering -->
+    <string name="developer_options_foveated">Foveated Level</string>
+    <!-- This string is used to label the Foveated radio button that disables fixed-foveated-rendering in immersive mode. -->
+    <string name="developer_options_foveated_disabled">Disabled</string>
+    <!-- This string is used to label the Foveated radio button that enables low-level fixed-foveated-rendering. -->
+    <string name="developer_options_foveated_1">1</string>
+    <!-- This string is used to label the Foveated radio button that enables medium-level fixed-foveated-rendering. -->
+    <string name="developer_options_foveated_2">2</string>
+    <!-- This string is used to label the Foveated radio button that enables high-level fixed-foveated-rendering. -->
+    <string name="developer_options_foveated_3">3</string>
     <!-- This string is used to label a set of radio buttons that allow the user to
      change the user-agent (UA) string of the browser. -->
     <string name="developer_options_ua_mode">User-Agent Mode</string>

app/src/noapi/cpp/DeviceDelegateNoAPI.cpp

@@ -154,6 +154,18 @@ DeviceDelegateNoAPI::ReleaseControllerDelegate() {
     m.controller = nullptr;
 }
 
+void
+DeviceDelegateNoAPI::SetFoveatedLevel(const uint32_t aLevel) {
+  // Not Supported
+}
+
+
+int32_t
+DeviceDelegateNoAPI::GetMaxFoveatedLevel() {
+  // Return 0 to indicate that it is not supported
+  return 0;
+}
+
 int32_t
 DeviceDelegateNoAPI::GetControllerModelCount() const {
   return 0;

app/src/noapi/cpp/DeviceDelegateNoAPI.h

@@ -31,6 +31,8 @@ class DeviceDelegateNoAPI : public DeviceDelegate {
   void SetClipPlanes(const float aNear, const float aFar) override;
   void SetControllerDelegate(ControllerDelegatePtr& aController) override;
   void ReleaseControllerDelegate() override;
+  void SetFoveatedLevel(const uint32_t aLevel) override;
+  int32_t GetMaxFoveatedLevel() override;
   int32_t GetControllerModelCount() const override;
   const std::string GetControllerModelName(const int32_t aModelIndex) const override;
   void ProcessEvents() override;

app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp

@@ -386,6 +386,21 @@ DeviceDelegateOculusVR::ReleaseControllerDelegate() {
   m.controller = nullptr;
 }
 
+void
+DeviceDelegateOculusVR::SetFoveatedLevel(const uint32_t aLevel) {
+  // Enable fixed-foveated rendering level.
+  vrapi_SetPropertyInt(&m.java, VRAPI_FOVEATION_LEVEL, aLevel);
+}
+
+int32_t
+DeviceDelegateOculusVR::GetMaxFoveatedLevel() {
+  int available = vrapi_GetSystemPropertyInt(&m.java, VRAPI_SYS_PROP_FOVEATION_AVAILABLE);
+  if (available == VRAPI_TRUE) {
+    return 3;
+  }
+  return 0;
+}
+
 int32_t
 DeviceDelegateOculusVR::GetControllerModelCount() const {
   return 1;

app/src/oculusvr/cpp/DeviceDelegateOculusVR.h

@@ -34,6 +34,8 @@ class DeviceDelegateOculusVR : public DeviceDelegate {
   void SetClipPlanes(const float aNear, const float aFar) override;
   void SetControllerDelegate(ControllerDelegatePtr& aController) override;
   void ReleaseControllerDelegate() override;
+  void SetFoveatedLevel(const uint32_t aLevel) override;
+  int32_t GetMaxFoveatedLevel() override;
   int32_t GetControllerModelCount() const override;
   const std::string GetControllerModelName(const int32_t aModelIndex) const override;
   void ProcessEvents() override;

app/src/svr/cpp/DeviceDelegateSVR.cpp

@@ -382,6 +382,17 @@ DeviceDelegateSVR::SetControllerDelegate(ControllerDelegatePtr& aController) {
   m.controller = aController;
 }
 
+void
+DeviceDelegateSVR::SetFoveatedLevel(const uint32_t aLevel) {
+  // Not supported
+}
+
+int32_t
+DeviceDelegateSVR::GetMaxFoveatedLevel() {
+  // Return 0 to indicate that it is not supported
+  return 0;
+}
+
 void
 DeviceDelegateSVR::ReleaseControllerDelegate() {
   m.controller = nullptr;

app/src/svr/cpp/DeviceDelegateSVR.h

@@ -34,6 +34,8 @@ class DeviceDelegateSVR : public DeviceDelegate {
   void SetClipPlanes(const float aNear, const float aFar) override;
   void SetControllerDelegate(ControllerDelegatePtr& aController) override;
   void ReleaseControllerDelegate() override;
+  void SetFoveatedLevel(const uint32_t aLevel) override;
+  int32_t GetMaxFoveatedLevel() override;
   int32_t GetControllerModelCount() const override;
   const std::string GetControllerModelName(const int32_t aModelIndex) const override;
   void ProcessEvents() override;