Use subdirectory of main data directory for QtWebEngine storage

Previously, an unrelated directory was used for this. Keep everything together for consistency.
Merge pull request #7045 from behunin/patch-1
2021-09-24 00:49:39 +03:00 · 2021-09-23 09:29:55 -07:00 · 2021-09-20 20:02:54 -06:00 · 2021-09-18 19:41:59 -06:00
8 changed files with 22 additions and 77 deletions
--- a/src/video_core/dirty_flags.h
+++ b/src/video_core/dirty_flags.h
@@ -38,9 +38,6 @@ enum : u8 {

    Shaders,

-    // Special entries
-    DepthBiasGlobal,
-
    LastCommonEntry,
 };

--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp
+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp
@@ -627,21 +627,9 @@ void RasterizerVulkan::UpdateDepthBias(Tegra::Engines::Maxwell3D::Regs& regs) {
    if (!state_tracker.TouchDepthBias()) {
        return;
    }
-    float units = regs.polygon_offset_units / 2.0f;
-    const bool is_d24 = regs.zeta.format == Tegra::DepthFormat::S8_UINT_Z24_UNORM ||
-                        regs.zeta.format == Tegra::DepthFormat::D24X8_UNORM ||
-                        regs.zeta.format == Tegra::DepthFormat::D24S8_UNORM ||
-                        regs.zeta.format == Tegra::DepthFormat::D24C8_UNORM;
-    if (is_d24 && !device.SupportsD24DepthBuffer()) {
-        // the base formulas can be obtained from here:
-        //   https://docs.microsoft.com/en-us/windows/win32/direct3d11/d3d10-graphics-programming-guide-output-merger-stage-depth-bias
-        const double rescale_factor =
-            static_cast<double>(1ULL << (32 - 24)) / (static_cast<double>(0x1.ep+127));
-        units = static_cast<float>(static_cast<double>(units) * rescale_factor);
-    }
-    scheduler.Record([constant = units, clamp = regs.polygon_offset_clamp,
+    scheduler.Record([constant = regs.polygon_offset_units, clamp = regs.polygon_offset_clamp,
                      factor = regs.polygon_offset_factor](vk::CommandBuffer cmdbuf) {
-        cmdbuf.SetDepthBias(constant, clamp, factor);
+        cmdbuf.SetDepthBias(constant, clamp, factor / 2.0f);
    });
 }

--- a/src/video_core/renderer_vulkan/vk_state_tracker.h
+++ b/src/video_core/renderer_vulkan/vk_state_tracker.h
@@ -79,8 +79,7 @@ public:
    }

    bool TouchDepthBias() {
-        return Exchange(Dirty::DepthBias, false) ||
-               Exchange(VideoCommon::Dirty::DepthBiasGlobal, false);
+        return Exchange(Dirty::DepthBias, false);
    }

    bool TouchBlendConstants() {
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -216,7 +216,6 @@ void TextureCache<P>::UpdateRenderTargets(bool is_clear) {
        BindRenderTarget(&render_targets.depth_buffer_id, FindDepthBuffer(is_clear));
    }
    const ImageViewId depth_buffer_id = render_targets.depth_buffer_id;
-
    PrepareImageView(depth_buffer_id, true, is_clear && IsFullClear(depth_buffer_id));

    for (size_t index = 0; index < NUM_RT; ++index) {
@@ -226,8 +225,6 @@ void TextureCache<P>::UpdateRenderTargets(bool is_clear) {
        maxwell3d.regs.render_area.width,
        maxwell3d.regs.render_area.height,
    };
-
-    flags[Dirty::DepthBiasGlobal] = true;
 }

 template <class P>
--- a/src/video_core/vulkan_common/vulkan_device.cpp
+++ b/src/video_core/vulkan_common/vulkan_device.cpp
@@ -618,10 +618,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
        is_float16_supported = false;
    }

-    supports_d24_depth =
-        IsFormatSupported(VK_FORMAT_D24_UNORM_S8_UINT,
-                          VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT, FormatType::Optimal);
-
    graphics_queue = logical.GetQueue(graphics_family);
    present_queue = logical.GetQueue(present_family);
 }
--- a/src/video_core/vulkan_common/vulkan_device.h
+++ b/src/video_core/vulkan_common/vulkan_device.h
@@ -327,10 +327,6 @@ public:
        return sets_per_pool;
    }

-    bool SupportsD24DepthBuffer() const {
-        return supports_d24_depth;
-    }
-
 private:
    /// Checks if the physical device is suitable.
    void CheckSuitability(bool requires_swapchain) const;
@@ -423,7 +419,6 @@ private:
    bool nv_device_diagnostics_config{};    ///< Support for VK_NV_device_diagnostics_config.
    bool has_renderdoc{};                   ///< Has RenderDoc attached
    bool has_nsight_graphics{};             ///< Has Nsight Graphics attached
-    bool supports_d24_depth{};              ///< Supports D24 depth buffers.

    // Telemetry parameters
    std::string vendor_name;                       ///< Device's driver name.
--- a/src/yuzu/applets/qt_web_browser.cpp
+++ b/src/yuzu/applets/qt_web_browser.cpp
@@ -54,6 +54,9 @@ QtNXWebEngineView::QtNXWebEngineView(QWidget* parent, Core::System& system,
      input_interpreter(std::make_unique<InputInterpreter>(system)),
      default_profile{QWebEngineProfile::defaultProfile()},
      global_settings{QWebEngineSettings::globalSettings()} {
+    default_profile->setPersistentStoragePath(QString::fromStdString(Common::FS::PathToUTF8String(
+        Common::FS::GetYuzuPath(Common::FS::YuzuPath::YuzuDir) / "qtwebengine")));
+
    QWebEngineScript gamepad;
    QWebEngineScript window_nx;

--- a/src/yuzu/configuration/configure_tas.ui
+++ b/src/yuzu/configuration/configure_tas.ui
@@ -2,37 +2,23 @@
 <ui version="4.0">
  <class>ConfigureTas</class>
  <widget class="QDialog" name="ConfigureTas">
-    <property name="geometry">
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>800</width>
-        <height>300</height>
-      </rect>
-    </property>
-    <property name="windowTitle">
-      <string>Dialog</string>
-    </property>
    <layout class="QVBoxLayout" name="verticalLayout_1">
      <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QHBoxLayout" name="horizontalLayout_1">
          <item>
-            <widget class="QGroupBox" name="groupBox">
+            <widget class="QGroupBox" name="groupBox_1">
              <property name="title">
                <string>TAS</string>
              </property>
-              <layout class="QGridLayout" name="gridLayout">
-                <item row="0" column="0" colspan="1">
+              <layout class="QGridLayout" name="gridLayout_1">
+                <item row="0" column="0" colspan="4">
                  <widget class="QLabel" name="label_1">
                    <property name="text">
-                      <string>Reads controller input from scripts in the same format as TAS-nx scripts. For a more detailed explanation please consult the FAQ on the yuzu website.</string>
-                    </property>
-                    <property name="wordWrap">
-                      <bool>true</bool>
+                      <string>Reads controller input from scripts in the same format as TAS-nx scripts.&lt;br/&gt;For a more detailed explanation please consult the FAQ on the yuzu website.</string>
                    </property>
                  </widget>
                </item>
-                <item row="1" column="0" colspan="1">
+                <item row="1" column="0" colspan="4">
                  <widget class="QLabel" name="label_2">
                    <property name="text">
                      <string>To check which hotkeys control the playback/recording, please refer to the Hotkey settings (General -> Hotkeys).</string>
@@ -42,10 +28,10 @@
                    </property>
                  </widget>
                </item>
-                <item row="2" column="0" colspan="1">
-                  <widget class="QLabel" name="label_2">
+                <item row="2" column="0" colspan="4">
+                  <widget class="QLabel" name="label_3">
                    <property name="text">
-                      <string>WARNING: This is an experimental feature. It will not play back scripts frame perfectly with the current, imperfect syncing method.</string>
+                      <string>WARNING: This is an experimental feature.&lt;br/&gt;It will not play back scripts frame perfectly with the current, imperfect syncing method.</string>
                    </property>
                    <property name="wordWrap">
                      <bool>true</bool>
@@ -58,13 +44,13 @@
        </layout>
      </item>
      <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
          <item>
-            <widget class="QGroupBox" name="groupBox">
+            <widget class="QGroupBox" name="groupBox_2">
              <property name="title">
                <string>Settings</string>
              </property>
-              <layout class="QGridLayout" name="gridLayout">
+              <layout class="QGridLayout" name="gridLayout_2">
                <item row="0" column="0" colspan="4">
                  <widget class="QCheckBox" name="tas_enable">
                    <property name="text">
@@ -102,15 +88,15 @@
        </layout>
      </item>
      <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
-            <widget class="QGroupBox" name="groupBox">
+            <widget class="QGroupBox" name="groupBox_3">
              <property name="title">
                <string>Script Directory</string>
              </property>
-              <layout class="QGridLayout" name="gridLayout">
+              <layout class="QGridLayout" name="gridLayout_3">
                <item row="0" column="0">
-                  <widget class="QLabel" name="label">
+                  <widget class="QLabel" name="label_4">
                    <property name="text">
                      <string>Path</string>
                    </property>
@@ -126,22 +112,6 @@
                <item row="0" column="2">
                  <widget class="QLineEdit" name="tas_path_edit"/>
                </item>
-                <item row="0" column="1">
-                  <spacer name="horizontalSpacer">
-                    <property name="orientation">
-                      <enum>Qt::Horizontal</enum>
-                    </property>
-                    <property name="sizeType">
-                      <enum>QSizePolicy::Maximum</enum>
-                    </property>
-                    <property name="sizeHint" stdset="0">
-                      <size>
-                        <width>60</width>
-                        <height>20</height>
-                      </size>
-                    </property>
-                  </spacer>
-                </item>
              </layout>
            </widget>
          </item>
Author	SHA1	Message	Date
v1993	3e07655b1b	Use subdirectory of main data directory for QtWebEngine storage Previously, an unrelated directory was used for this. Keep everything together for consistency.	2021-09-24 00:49:39 +03:00
bunnei	17bf40f405	Merge pull request #7045 from behunin/patch-1 Tas configure ui nits	2021-09-23 09:29:55 -07:00
Levi Behunin	77e327dd1a	Clean-up Numerize names, remove unneeded properties and spacer.	2021-09-20 20:02:54 -06:00
Levi Behunin	ad85689417	Tas configure ui nits Text looked cramped on my pc (Ubuntu 21.04). Re-flowed text as well for nicer read.	2021-09-18 19:41:59 -06:00