archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More Header cleanup

Browse source
This commit is contained in:
Megamouse 2020-11-06 18:45:06 +01:00
parent e2303f3378
commit a3eb5c2d63
25 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utilities/Thread.h
View file

@ -1,4 +1,4 @@
#pragma once #pragma once
#include "types.h" #include "types.h"
#include "util/atomic.hpp" #include "util/atomic.hpp"

3
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View file

@ -4,6 +4,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "Emu/Io/interception.h" #include "Emu/Io/interception.h"
#include "Emu/RSX/Overlays/overlay_osk.h" #include "Emu/RSX/Overlays/overlay_osk.h"
#include "Emu/IdManager.h"
#include "cellSysutil.h" #include "cellSysutil.h"
#include "cellOskDialog.h" #include "cellOskDialog.h"
@ -11,6 +12,8 @@
#include "util/init_mutex.hpp" #include "util/init_mutex.hpp"
#include <thread>
LOG_CHANNEL(cellOskDialog); LOG_CHANNEL(cellOskDialog);
template<> template<>

1
rpcs3/Emu/RSX/Capture/rsx_replay.cpp
View file

@ -1,6 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "rsx_replay.h" #include "rsx_replay.h"
#include "Emu/Cell/ErrorCodes.h"
#include "Emu/Cell/lv2/sys_rsx.h" #include "Emu/Cell/lv2/sys_rsx.h"
#include "Emu/Cell/lv2/sys_memory.h" #include "Emu/Cell/lv2/sys_memory.h"
#include "Emu/RSX/RSXThread.h" #include "Emu/RSX/RSXThread.h"

2
rpcs3/Emu/RSX/Capture/rsx_replay.h
View file

@ -1,8 +1,6 @@
#pragma once #pragma once
#include "Emu/CPU/CPUThread.h" #include "Emu/CPU/CPUThread.h"
#include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/lv2/sys_sync.h"
#include "Emu/RSX/rsx_methods.h" #include "Emu/RSX/rsx_methods.h"
#include <cereal/types/vector.hpp> #include <cereal/types/vector.hpp>

1
rpcs3/Emu/RSX/Common/ShaderInterpreter.h
View file

@ -1,5 +1,4 @@
#pragma once #pragma once
#include "Utilities/StrFmt.h"
namespace program_common namespace program_common
{ {

4
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -1,10 +1,8 @@
#pragma once #pragma once
#include "Emu/Memory/vm.h"
#include "surface_utils.h" #include "surface_utils.h"
#include "../GCM.h" #include "../gcm_enums.h"
#include "../rsx_utils.h" #include "../rsx_utils.h"
#include "Utilities/span.h"
#include <list> #include <list>
namespace rsx namespace rsx

1
rpcs3/Emu/RSX/Common/surface_utils.h
View file

@ -5,6 +5,7 @@
#include "Utilities/address_range.h" #include "Utilities/address_range.h"
#include "TextureUtils.h" #include "TextureUtils.h"
#include "../rsx_utils.h" #include "../rsx_utils.h"
#include "Emu/Memory/vm.h"
#define ENABLE_SURFACE_CACHE_DEBUG 0 #define ENABLE_SURFACE_CACHE_DEBUG 0

3
rpcs3/Emu/RSX/GCM.h
View file

@ -1,8 +1,7 @@
#pragma once #pragma once
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "gcm_enums.h" #include "gcm_enums.h"
#include "gcm_printing.h"
#include "util/atomic.hpp" #include "util/atomic.hpp"

1
rpcs3/Emu/RSX/Overlays/Shaders/shader_loading_dialog_native.cpp
View file

@ -2,6 +2,7 @@
#include "shader_loading_dialog_native.h" #include "shader_loading_dialog_native.h"
#include "../overlay_message_dialog.h" #include "../overlay_message_dialog.h"
#include "../../GSRender.h" #include "../../GSRender.h"
#include "Emu/Cell/ErrorCodes.h"
namespace rsx namespace rsx
{ {

4
rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
View file

@ -3,6 +3,10 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/system_config.h" #include "Emu/system_config.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
#include "Emu/IdManager.h"
#include "Utilities/Thread.h"
#include <thread>
namespace rsx namespace rsx
{ {

1
rpcs3/Emu/RSX/Overlays/overlay_trophy_notification.cpp
View file

@ -1,5 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "overlay_trophy_notification.h" #include "overlay_trophy_notification.h"
#include "Emu/Cell/ErrorCodes.h"
#include "Emu/RSX/RSXThread.h" #include "Emu/RSX/RSXThread.h"
namespace rsx namespace rsx

5
rpcs3/Emu/RSX/Overlays/overlays.h
View file

@ -2,14 +2,13 @@
#include "overlay_animation.h" #include "overlay_animation.h"
#include "overlay_controls.h" #include "overlay_controls.h"
#include "../../../Utilities/Thread.h"
#include "Emu/Memory/vm.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Utilities/mutex.h"
#include "Utilities/Timer.h" #include "Utilities/Timer.h"
#include <list> #include <list>
#include <thread> #include <mutex>
// Utils // Utils
extern u64 get_system_time(); extern u64 get_system_time();

6
rpcs3/Emu/RSX/RSXFIFO.cpp
View file

@ -3,6 +3,7 @@
#include "RSXFIFO.h" #include "RSXFIFO.h"
#include "RSXThread.h" #include "RSXThread.h"
#include "Capture/rsx_capture.h" #include "Capture/rsx_capture.h"
#include "Emu/Cell/lv2/sys_rsx.h"
namespace rsx namespace rsx
{ {
@ -14,6 +15,11 @@ namespace rsx
m_iotable = &pctrl->iomap_table; m_iotable = &pctrl->iomap_table;
} }
void FIFO_control::sync_get()
{
m_ctrl->get.release(m_internal_get);
}
void FIFO_control::inc_get(bool wait) void FIFO_control::inc_get(bool wait)
{ {
m_internal_get += 4; m_internal_get += 4;

7
rpcs3/Emu/RSX/RSXFIFO.h
View file

@ -1,10 +1,9 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "Utilities/types.h"
#include "util/atomic.hpp" #include "Emu/RSX/gcm_enums.h"
#include "rsx_utils.h" struct RsxDmaControl;
#include "Emu/Cell/lv2/sys_rsx.h"
namespace rsx namespace rsx
{ {
@ -131,7 +130,7 @@ namespace rsx
u32 get_pos() const { return m_internal_get; } u32 get_pos() const { return m_internal_get; }
u32 last_cmd() const { return m_cmd; } u32 last_cmd() const { return m_cmd; }
void sync_get() { m_ctrl->get.release(m_internal_get); } void sync_get();
u32 get_current_arg_ptr() const { return m_args_ptr; }; u32 get_current_arg_ptr() const { return m_args_ptr; };
u32 get_remaining_args_count() const { return m_remaining_commands; } u32 get_remaining_args_count() const { return m_remaining_commands; }
void inc_get(bool wait); void inc_get(bool wait);

4
rpcs3/Emu/RSX/RSXOffload.h
View file

@ -1,13 +1,9 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "Utilities/types.h"
#include "Utilities/lockless.h"
#include "Utilities/Thread.h"
#include "Utilities/address_range.h" #include "Utilities/address_range.h"
#include "gcm_enums.h"
#include <vector> #include <vector>
#include <thread>
namespace rsx namespace rsx
{ {

2
rpcs3/Emu/RSX/VK/VKOverlays.h
View file

@ -9,6 +9,8 @@
#include "../Overlays/overlays.h" #include "../Overlays/overlays.h"
#include "Utilities/hash.h"
#define VK_OVERLAY_MAX_DRAW_CALLS 1024 #define VK_OVERLAY_MAX_DRAW_CALLS 1024
namespace vk namespace vk

3
rpcs3/Emu/RSX/VK/VKRenderTargets.h
View file

@ -3,10 +3,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "VKHelpers.h" #include "VKHelpers.h"
#include "VKFormats.h" #include "VKFormats.h"
#include "../GCM.h"
#include "../Common/surface_store.h" #include "../Common/surface_store.h"
#include "../Common/TextureUtils.h"
#include "../Common/texture_cache_utils.h"
namespace vk namespace vk
{ {

2
rpcs3/Emu/RSX/VK/VKTexture.cpp
View file

@ -1,8 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "VKHelpers.h" #include "VKHelpers.h"
#include "../GCM.h" #include "../GCM.h"
#include "../RSXThread.h"
#include "../RSXTexture.h"
#include "../rsx_utils.h" #include "../rsx_utils.h"
#include "VKFormats.h" #include "VKFormats.h"
#include "VKCompute.h" #include "VKCompute.h"

1
rpcs3/Emu/RSX/rsx_vertex_data.h
View file

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "gcm_enums.h" #include "gcm_enums.h"
#include "rsx_decode.h"
#include "Utilities/types.h" #include "Utilities/types.h"
#include "rsx_utils.h" #include "rsx_utils.h"

1
rpcs3/rpcs3qt/render_creator.cpp
View file

@ -2,7 +2,6 @@
#include <QMessageBox> #include <QMessageBox>
#include "Utilities/Config.h"
#include "Utilities/Thread.h" #include "Utilities/Thread.h"
#if defined(_WIN32) || defined(HAVE_VULKAN) #if defined(_WIN32) || defined(HAVE_VULKAN)

1
rpcs3/rpcs3qt/rsx_debugger.cpp
View file

@ -4,6 +4,7 @@
#include "memory_viewer_panel.h" #include "memory_viewer_panel.h"
#include "table_item_delegate.h" #include "table_item_delegate.h"
#include "Emu/RSX/RSXThread.h" #include "Emu/RSX/RSXThread.h"
#include "Emu/RSX/gcm_printing.h"
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QHeaderView> #include <QHeaderView>

8
rpcs3/rpcs3qt/save_data_dialog.cpp
View file

@ -1,10 +1,12 @@
#include "save_data_dialog.h" #include "save_data_dialog.h"
#include "save_data_list_dialog.h" #include "save_data_list_dialog.h"
#include <Emu/System.h> #include "Emu/System.h"
#include <Emu/IdManager.h> #include "Emu/IdManager.h"
#include "Emu/Io/interception.h" #include "Emu/Io/interception.h"
#include <Emu/RSX/Overlays/overlay_save_dialog.h> #include "Emu/RSX/Overlays/overlay_save_dialog.h"
#include "Utilities/Thread.h"
s32 save_data_dialog::ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet) s32 save_data_dialog::ShowSaveDataList(std::vector<SaveDataEntry>& save_entries, s32 focused, u32 op, vm::ptr<CellSaveDataListSet> listSet)
{ {

1
rpcs3/rpcs3qt/trophy_notification_helper.cpp
View file

@ -1,6 +1,7 @@
#include "trophy_notification_helper.h" #include "trophy_notification_helper.h"
#include "trophy_notification_frame.h" #include "trophy_notification_frame.h"
#include "../Emu/IdManager.h"
#include "../Emu/System.h" #include "../Emu/System.h"
#include "../Emu/RSX/Overlays/overlay_trophy_notification.h" #include "../Emu/RSX/Overlays/overlay_trophy_notification.h"

1
rpcs3/rpcs3qt/vfs_dialog_tab.cpp
View file

@ -1,4 +1,5 @@
#include "vfs_dialog_tab.h" #include "vfs_dialog_tab.h"
#include "Utilities/Config.h"
#include <QFileDialog> #include <QFileDialog>
#include <QCoreApplication> #include <QCoreApplication>

6
rpcs3/rpcs3qt/vfs_dialog_tab.h
View file

@ -1,7 +1,6 @@
#pragma once #pragma once
#include "stdafx.h" #include "stdafx.h"
#include "Utilities/Config.h"
#include "gui_settings.h" #include "gui_settings.h"
#include "emu_settings.h" #include "emu_settings.h"
@ -10,6 +9,11 @@
#include <QListWidget> #include <QListWidget>
#include <QLabel> #include <QLabel>
namespace cfg
{
class string;
}
struct vfs_settings_info struct vfs_settings_info
{ {
QString name; // name of tab QString name; // name of tab