Move nvdata.h into yuzu_common

N3xoX1 · N3xoX1 · commit 8337c9646db6 · 2025-06-08T18:54:18.000+09:30
diff --git a/src/nxemu-os/core/gpu_dirty_memory_manager.h b/src/nxemu-os/core/gpu_dirty_memory_manager.h
@@ -10,8 +10,6 @@
 #include <utility>
 #include <vector>
 
-#include <yuzu_video_core/device_memory_manager.h>
-
 namespace Core {
 
 class GPUDirtyMemoryManager {
@@ -80,6 +78,7 @@ class GPUDirtyMemoryManager {
         u32 mask;
     };
 
+    constexpr static size_t DEVICE_PAGEBITS = 12ULL;
     constexpr static size_t page_bits = DEVICE_PAGEBITS - 1;
     constexpr static size_t page_size = 1ULL << page_bits;
     constexpr static size_t page_mask = page_size - 1;
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/container.h b/src/nxemu-os/core/hle/service/nvdrv/core/container.h
@@ -8,8 +8,8 @@
 #include <memory>
 #include <unordered_map>
 
-#include "yuzu_video_core/device_memory_manager.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
+#include "yuzu_common/nvdata.h"
+#include <nxemu-module-spec/video.h>
 
 namespace Kernel {
 class KProcess;
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/heap_mapper.cpp b/src/nxemu-os/core/hle/service/nvdrv/core/heap_mapper.cpp
@@ -5,6 +5,7 @@
 
 #include "yuzu_common/range_sets.h"
 #include "yuzu_common/range_sets.inc"
+#include "yuzu_common/yuzu_assert.h"
 #include "core/hle/service/nvdrv/core/heap_mapper.h"
 #include <nxemu-module-spec/video.h>
 
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/heap_mapper.h b/src/nxemu-os/core/hle/service/nvdrv/core/heap_mapper.h
@@ -6,7 +6,8 @@
 #include <memory>
 
 #include "yuzu_common/common_types.h"
-#include "yuzu_video_core/device_memory_manager.h"
+#include "yuzu_common/nvdata.h"
+#include <nxemu-module-spec/video.h>
 
 namespace Tegra::Host1x {
 class Host1x;
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/nvmap.cpp b/src/nxemu-os/core/hle/service/nvdrv/core/nvmap.cpp
@@ -11,7 +11,6 @@
 #include "core/hle/service/nvdrv/core/heap_mapper.h"
 #include "core/hle/service/nvdrv/core/nvmap.h"
 #include "core/memory.h"
-#include "yuzu_video_core/host1x/host1x.h"
 #include <nxemu-module-spec/video.h>
 
 using Core::Memory::YUZU_PAGESIZE;
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/nvmap.h b/src/nxemu-os/core/hle/service/nvdrv/core/nvmap.h
@@ -14,8 +14,8 @@
 
 #include "yuzu_common/bit_field.h"
 #include "yuzu_common/common_types.h"
+#include "yuzu_common/nvdata.h"
 #include "core/hle/service/nvdrv/core/container.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
 
 namespace Tegra {
 
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/syncpoint_manager.cpp b/src/nxemu-os/core/hle/service/nvdrv/core/syncpoint_manager.cpp
@@ -4,7 +4,6 @@
 
 #include "yuzu_common/yuzu_assert.h"
 #include "core/hle/service/nvdrv/core/syncpoint_manager.h"
-#include "yuzu_video_core/host1x/host1x.h"
 
 namespace Service::Nvidia::NvCore {
 
diff --git a/src/nxemu-os/core/hle/service/nvdrv/core/syncpoint_manager.h b/src/nxemu-os/core/hle/service/nvdrv/core/syncpoint_manager.h
@@ -9,7 +9,8 @@
 #include <mutex>
 
 #include "yuzu_common/common_types.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
+#include "yuzu_common/fence.h"
+#include "yuzu_common/nvdata.h"
 
 __interface IVideo;
 
diff --git a/src/nxemu-os/core/hle/service/nvdrv/devices/nvdevice.h b/src/nxemu-os/core/hle/service/nvdrv/devices/nvdevice.h
@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "yuzu_common/common_types.h"
+#include "yuzu_common/nvdata.h"
 #include "core/hle/service/nvdrv/core/container.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
 
 namespace Core {
 class System;
diff --git a/src/nxemu-os/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp b/src/nxemu-os/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@@ -3,15 +3,15 @@
 
 #include <boost/container/small_vector.hpp>
 
-#include "yuzu_common/yuzu_assert.h"
+#include "yuzu_common/nvdata.h"
 #include "yuzu_common/logging/log.h"
+#include "yuzu_common/yuzu_assert.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/hle/service/nvdrv/core/container.h"
 #include "core/hle/service/nvdrv/core/nvmap.h"
 #include "core/hle/service/nvdrv/devices/nvdisp_disp0.h"
 #include "core/perf_stats.h"
-#include "yuzu_video_core/gpu.h"
 #include <nxemu-module-spec/video.h>
 
 namespace Service::Nvidia::Devices {
diff --git a/src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -16,8 +16,6 @@
 #include "core/hle/service/nvdrv/core/syncpoint_manager.h"
 #include "core/hle/service/nvdrv/devices/ioctl_serialization.h"
 #include "core/hle/service/nvdrv/devices/nvhost_ctrl.h"
-#include "yuzu_video_core/gpu.h"
-#include "yuzu_video_core/host1x/host1x.h"
 
 namespace Service::Nvidia::Devices {
 
diff --git a/src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_ctrl.h b/src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_ctrl.h
@@ -10,7 +10,6 @@
 #include "yuzu_common/common_types.h"
 #include "core/hle/service/nvdrv/devices/nvdevice.h"
 #include "core/hle/service/nvdrv/nvdrv.h"
-#include "yuzu_video_core/host1x/syncpoint_manager.h"
 
 namespace Service::Nvidia::NvCore {
 class Container;
@@ -76,9 +75,6 @@ class nvhost_ctrl final : public nvdevice {
         // Tells if an NVEvent is registered or not
         bool registered{};
 
-        // Used for waiting on a syncpoint & canceling it.
-        Tegra::Host1x::SyncpointManager::ActionHandle wait_handle{};
-
         bool IsBeingUsed() const {
             const auto current_status = status.load(std::memory_order_acquire);
             return current_status == EventState::Waiting ||
diff --git a/src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/nxemu-os/core/hle/service/nvdrv/devices/nvhost_gpu.h
@@ -8,9 +8,10 @@
 #include "yuzu_common/bit_field.h"
 #include "yuzu_common/common_funcs.h"
 #include "yuzu_common/common_types.h"
+#include "yuzu_common/fence.h"
+#include "yuzu_common/nvdata.h"
 #include "yuzu_common/swap.h"
 #include "core/hle/service/nvdrv/devices/nvdevice.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
 #include "yuzu_video_core/dma_pusher.h"
 
 namespace Tegra {
@@ -125,8 +126,6 @@ class nvhost_gpu final : public nvdevice {
     static_assert(sizeof(IoctlGetErrorNotification) == 16,
                   "IoctlGetErrorNotification is incorrect size");
 
-    static_assert(sizeof(NvFence) == 8, "Fence is incorrect size");
-
     struct IoctlAllocGpfifoEx {
         u32_le num_entries{};
         u32_le flags{};
diff --git a/src/nxemu-os/core/hle/service/nvdrv/nvdrv.cpp b/src/nxemu-os/core/hle/service/nvdrv/nvdrv.cpp
@@ -25,7 +25,6 @@
 #include "core/hle/service/nvdrv/nvmemp.h"
 #include "core/hle/service/nvnflinger/nvnflinger.h"
 #include "core/hle/service/server_manager.h"
-#include "yuzu_video_core/gpu.h"
 
 namespace Service::Nvidia {
 
diff --git a/src/nxemu-os/core/hle/service/nvdrv/nvdrv.h b/src/nxemu-os/core/hle/service/nvdrv/nvdrv.h
@@ -12,9 +12,9 @@
 #include <unordered_map>
 
 #include "yuzu_common/common_types.h"
+#include "yuzu_common/nvdata.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/nvdrv/core/container.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
 #include "core/hle/service/service.h"
 
 namespace Core {
diff --git a/src/nxemu-os/core/hle/service/nvdrv/nvdrv_interface.cpp b/src/nxemu-os/core/hle/service/nvdrv/nvdrv_interface.cpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "yuzu_common/logging/log.h"
+#include "yuzu_common/nvdata.h"
 #include "yuzu_common/scope_exit.h"
 #include "yuzu_common/string_util.h"
 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/service/ipc_helpers.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
 #include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/nvdrv/nvdrv_interface.h"
 
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/buffer_item.h b/src/nxemu-os/core/hle/service/nvnflinger/buffer_item.h
@@ -9,8 +9,8 @@
 #include <memory>
 
 #include "yuzu_common/common_types.h"
+#include "yuzu_common/fence.h"
 #include "yuzu_common/math_util.h"
-#include "yuzu_video_core/service/nvnflinger/ui/fence.h"
 #include "core/hle/service/nvnflinger/window.h"
 
 namespace Service::android {
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/buffer_queue_core.h b/src/nxemu-os/core/hle/service/nvnflinger/buffer_queue_core.h
@@ -15,9 +15,9 @@
 
 #include "core/hle/service/nvnflinger/buffer_item.h"
 #include "core/hle/service/nvnflinger/buffer_queue_defs.h"
-#include "yuzu_video_core/service/nvnflinger/pixel_format.h"
 #include "core/hle/service/nvnflinger/status.h"
 #include "core/hle/service/nvnflinger/window.h"
+#include "yuzu_common/nvdata.h"
 
 namespace Service::android {
 
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/buffer_queue_producer.h b/src/nxemu-os/core/hle/service/nvnflinger/buffer_queue_producer.h
@@ -11,12 +11,11 @@
 #include <mutex>
 
 #include "yuzu_common/common_funcs.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
+#include "yuzu_common/nvdata.h"
 #include "core/hle/service/nvnflinger/binder.h"
 #include "core/hle/service/nvnflinger/buffer_queue_defs.h"
 #include "core/hle/service/nvnflinger/buffer_slot.h"
 #include "core/hle/service/nvnflinger/graphic_buffer_producer.h"
-#include "yuzu_video_core/service/nvnflinger/pixel_format.h"
 #include "core/hle/service/nvnflinger/status.h"
 #include "core/hle/service/nvnflinger/window.h"
 
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/buffer_slot.h b/src/nxemu-os/core/hle/service/nvnflinger/buffer_slot.h
@@ -9,7 +9,7 @@
 #include <memory>
 
 #include "yuzu_common/common_types.h"
-#include "yuzu_video_core/service/nvnflinger/ui/fence.h"
+#include "yuzu_common/fence.h"
 
 namespace Service::android {
 
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/graphic_buffer_producer.h b/src/nxemu-os/core/hle/service/nvnflinger/graphic_buffer_producer.h
@@ -8,8 +8,8 @@
 
 #include "yuzu_common/common_funcs.h"
 #include "yuzu_common/common_types.h"
+#include "yuzu_common/fence.h"
 #include "yuzu_common/math_util.h"
-#include "yuzu_video_core/service/nvnflinger/ui/fence.h"
 #include "core/hle/service/nvnflinger/window.h"
 
 namespace Service::android {
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/hwc_layer.h b/src/nxemu-os/core/hle/service/nvnflinger/hwc_layer.h
@@ -4,10 +4,9 @@
 #pragma once
 
 #include "yuzu_common/math_util.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
-#include "yuzu_video_core/service/nvnflinger/buffer_transform_flags.h"
-#include "yuzu_video_core/service/nvnflinger/pixel_format.h"
-#include "yuzu_video_core/service/nvnflinger/ui/fence.h"
+#include "yuzu_common/common_funcs.h"
+#include "yuzu_common/fence.h"
+#include "yuzu_common/nvdata.h"
 
 namespace Service::Nvnflinger {
 
diff --git a/src/nxemu-os/core/hle/service/nvnflinger/ui/graphic_buffer.h b/src/nxemu-os/core/hle/service/nvnflinger/ui/graphic_buffer.h
@@ -10,7 +10,7 @@
 
 #include "yuzu_common/common_funcs.h"
 #include "yuzu_common/common_types.h"
-#include "yuzu_video_core/service/nvnflinger/pixel_format.h"
+#include "yuzu_common/nvdata.h"
 
 namespace Service::Nvidia::NvCore {
 class NvMap;
diff --git a/src/nxemu-os/nxemu-os.vcxproj b/src/nxemu-os/nxemu-os.vcxproj
@@ -460,7 +460,6 @@
     <ClInclude Include="core\cpu_manager.h" />
     <ClInclude Include="core\debugger\debugger.h" />
     <ClInclude Include="core\device_memory.h" />
-    <ClInclude Include="core\device_memory_manager.h" />
     <ClInclude Include="core\file_sys\errors.h" />
     <ClInclude Include="core\file_sys\filesystem_interfaces.h" />
     <ClInclude Include="core\file_sys\fsa\fs_i_filesystem.h" />
diff --git a/src/nxemu-os/nxemu-os.vcxproj.filters b/src/nxemu-os/nxemu-os.vcxproj.filters
@@ -522,9 +522,6 @@
     <ClInclude Include="core\gpu_dirty_memory_manager.h">
       <Filter>Header Files\core</Filter>
     </ClInclude>
-    <ClInclude Include="core\device_memory_manager.h">
-      <Filter>Header Files\core</Filter>
-    </ClInclude>
     <ClInclude Include="core\hle\result.h">
       <Filter>Header Files\core\hle</Filter>
     </ClInclude>
diff --git a/src/yuzu_common/fence.h b/src/yuzu_common/fence.h
@@ -9,7 +9,16 @@
 #include <array>
 
 #include "yuzu_common/common_types.h"
-#include "yuzu_video_core/service/nvdrv/nvdata.h"
+#include "yuzu_common/nvdata.h"
+
+namespace Service::Nvidia {
+
+    struct NvFence {
+        s32 id;
+        u32 value;
+    };
+    static_assert(sizeof(NvFence) == 8, "NvFence has wrong size");
+}
 
 namespace Service::android {
 
diff --git a/src/yuzu_common/nvdata.h b/src/yuzu_common/nvdata.h
@@ -6,8 +6,15 @@
 
 #include <array>
 #include "yuzu_common/bit_field.h"
+#include "yuzu_common/common_funcs.h"
 #include "yuzu_common/common_types.h"
 
+namespace Core {
+struct Asid {
+    size_t id;
+};
+} // namespace Core
+
 namespace Service::Nvidia {
 
 constexpr u32 MaxSyncPoints = 192;
@@ -16,12 +23,6 @@ using DeviceFD = s32;
 
 constexpr DeviceFD INVALID_NVDRV_FD = -1;
 
-struct NvFence {
-    s32 id;
-    u32 value;
-};
-static_assert(sizeof(NvFence) == 8, "NvFence has wrong size");
-
 enum class NvResult : u32 {
     Success = 0x0,
     NotImplemented = 0x1,
@@ -100,3 +101,44 @@ union Ioctl {
 };
 
 } // namespace Service::Nvidia
+
+namespace Service::android {
+
+enum class BufferTransformFlags : u32 {
+    /// No transform flags are set
+    Unset = 0x00,
+    /// Flip source image horizontally (around the vertical axis)
+    FlipH = 0x01,
+    /// Flip source image vertically (around the horizontal axis)
+    FlipV = 0x02,
+    /// Rotate source image 90 degrees clockwise
+    Rotate90 = 0x04,
+    /// Rotate source image 180 degrees
+    Rotate180 = 0x03,
+    /// Rotate source image 270 degrees clockwise
+    Rotate270 = 0x07,
+};
+DECLARE_ENUM_FLAG_OPERATORS(BufferTransformFlags);
+
+enum class PixelFormat : u32 {
+    NoFormat = 0,
+    Rgba8888 = 1,
+    Rgbx8888 = 2,
+    Rgb888 = 3,
+    Rgb565 = 4,
+    Bgra8888 = 5,
+    Rgba5551 = 6,
+    Rgba4444 = 7,
+};
+
+} // namespace Service::android
+
+namespace Tegra {
+
+enum class BlendMode {
+    Opaque,
+    Premultiplied,
+    Coverage,
+};
+
+} // namespace Tegra
diff --git a/src/yuzu_common/yuzu_common.vcxproj b/src/yuzu_common/yuzu_common.vcxproj
@@ -51,6 +51,7 @@
     <ClInclude Include="dynamic_library.h" />
     <ClInclude Include="error.h" />
     <ClInclude Include="expected.h" />
+    <ClInclude Include="fence.h" />
     <ClInclude Include="fiber.h" />
     <ClInclude Include="free_region_manager.h" />
     <ClInclude Include="fs\file.h" />
@@ -80,6 +81,7 @@
     <ClInclude Include="math_util.h" />
     <ClInclude Include="microprofile.h" />
     <ClInclude Include="multi_level_page_table.h" />
+    <ClInclude Include="nvdata.h" />
     <ClInclude Include="overflow.h" />
     <ClInclude Include="page_table.h" />
     <ClInclude Include="param_package.h" />
diff --git a/src/yuzu_common/yuzu_common.vcxproj.filters b/src/yuzu_common/yuzu_common.vcxproj.filters
diff --git a/src/yuzu_video_core/device_memory_manager.h b/src/yuzu_video_core/device_memory_manager.h
diff --git a/src/yuzu_video_core/framebuffer_config.h b/src/yuzu_video_core/framebuffer_config.h
diff --git a/src/yuzu_video_core/gpu.h b/src/yuzu_video_core/gpu.h
diff --git a/src/yuzu_video_core/renderer_opengl/gl_blit_screen.h b/src/yuzu_video_core/renderer_opengl/gl_blit_screen.h
diff --git a/src/yuzu_video_core/service/nvnflinger/buffer_transform_flags.h b/src/yuzu_video_core/service/nvnflinger/buffer_transform_flags.h
diff --git a/src/yuzu_video_core/service/nvnflinger/pixel_format.h b/src/yuzu_video_core/service/nvnflinger/pixel_format.h
diff --git a/src/yuzu_video_core/yuzu_video_core.vcxproj b/src/yuzu_video_core/yuzu_video_core.vcxproj
diff --git a/src/yuzu_video_core/yuzu_video_core.vcxproj.filters b/src/yuzu_video_core/yuzu_video_core.vcxproj.filters
