RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-07 15:36:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move types.h to util/types.hpp

Browse source
This commit is contained in:
Nekotekina 2020-12-12 15:01:29 +03:00
parent 666a18f5e5
commit b59f142d4e
75 changed files with 87 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Audio/AudioBackend.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
enum : u32
{
@ -101,7 +101,7 @@ public:
u32 get_sample_size() const;
u32 get_channels() const;
bool get_convert_to_u16() const;
bool has_capability(u32 cap) const;

2
rpcs3/Emu/Audio/AudioDumper.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/File.h"
struct WAVHeader

2
rpcs3/Emu/CPU/CPUTranslator.h
View file

@ -24,7 +24,7 @@
#endif
#include "define_new_memleakdetect.h"
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/StrFmt.h"
#include "Utilities/BEType.h"
#include "Utilities/BitField.h"

2
rpcs3/Emu/Cell/Common.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
// Floating-point rounding mode (for both PPU and SPU)
enum FPSCR_RN

2
rpcs3/Emu/Cell/ErrorCodes.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
// Error code type (return type), implements error reporting.
class error_code

2
rpcs3/Emu/Cell/MFC.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
enum MFC : u8
{

2
rpcs3/Emu/Cell/Modules/StaticHLE.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "../../Utilities/types.h"
#include "util/types.hpp"
#include "Emu/Memory/vm_ptr.h"
#include <vector>

2
rpcs3/Emu/Cell/SPUAnalyser.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
// SPU Instruction Type
struct spu_itype

2
rpcs3/Emu/Cell/lv2/sys_trace.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
// SysCalls
s32 sys_trace_create();

2
rpcs3/Emu/GameInfo.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include <string>
struct GameInfo

6
rpcs3/Emu/IdManager.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/mutex.h"
#include <memory>
@ -48,7 +48,7 @@ namespace id_manager
static constexpr std::pair<u32, u32> invl_range = invl_range_extract_impl<T>::invl_range;
static_assert(count && step && u64{step} * (count - 1) + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");
// TODO: Add more conditions
static_assert(!invl_range.second || (u64{invl_range.second} + invl_range.first <= 32 /*....*/ ));
};
@ -580,7 +580,7 @@ public:
{
std::lock_guard lock(id_manager::g_mutex);
if (const auto found = find_id<T, Get>(id); found &&
if (const auto found = find_id<T, Get>(id); found &&
(!found->second.owner_before(sptr) && !sptr.owner_before(found->second)))
{
ptr = std::move(found->second);

4
rpcs3/Emu/Io/Keyboard.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
enum
{
@ -92,7 +92,7 @@ enum Keys
CELL_KEYC_KANA = 0x88,
CELL_KEYC_HENKAN = 0x8a,
CELL_KEYC_MUHENKAN = 0x8b,
// Raw keycodes for ASCII keys
CELL_KEYC_A = 0x04,
CELL_KEYC_B = 0x05,

2
rpcs3/Emu/Io/PadHandler.h
View file

@ -4,7 +4,7 @@
#include "pad_types.h"
#include "pad_config.h"
#include "pad_config_types.h"
#include "Utilities/types.h"
#include "util/types.hpp"
struct PadDevice
{

2
rpcs3/Emu/Io/pad_config_types.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
enum class pad_handler
{

2
rpcs3/Emu/Memory/vm.h
View file

@ -2,7 +2,7 @@
#include <map>
#include <memory>
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/StrFmt.h"
#include "Utilities/BEType.h"

2
rpcs3/Emu/Memory/vm_ptr.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/BEType.h"
#include "vm.h"

3
rpcs3/Emu/RSX/Capture/rsx_trace.h
View file

@ -1,8 +1,9 @@
#pragma once
#include <string>
#include <array>
#include <vector>
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Emu/RSX/rsx_methods.h"
namespace rsx

2
rpcs3/Emu/RSX/Common/ShaderParam.h
View file

@ -4,7 +4,7 @@
#include <vector>
#include "Utilities/StrUtil.h"
#include "Utilities/types.h"
#include "util/types.hpp"
enum class FUNCTION
{

2
rpcs3/Emu/RSX/Common/TextGlyphs.h
View file

@ -6,7 +6,7 @@
#include <unordered_map>
#include <vector>
#include "Utilities/types.h"
#include "util/types.hpp"
/**
* FONT GLYPHS GO HERE

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

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h"
#include "Utilities/address_range.h"
#include "TextureUtils.h"

3
rpcs3/Emu/RSX/GL/GLExecutionState.h
View file

@ -1,5 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h"
#include "OpenGL.h"

3
rpcs3/Emu/RSX/Overlays/overlay_animation.h
View file

@ -1,5 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h"
#include "overlay_utils.h"

3
rpcs3/Emu/RSX/Overlays/overlay_controls.h
View file

@ -1,5 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h"
#include "Utilities/File.h"
#include "overlay_utils.h"

2
rpcs3/Emu/RSX/Overlays/overlay_fonts.h
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "overlay_utils.h"
#include <vector>

3
rpcs3/Emu/RSX/Overlays/overlay_utils.h
View file

@ -1,5 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h"
#include <string>

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

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Emu/RSX/gcm_enums.h"
struct RsxDmaControl;

2
rpcs3/Emu/RSX/RSXFragmentProgram.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "gcm_enums.h"
#include "Utilities/types.h"
#include "util/types.hpp"
enum register_type
{

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

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/address_range.h"
#include <vector>

2
rpcs3/Emu/RSX/RSXVertexProgram.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "gcm_enums.h"
#include "Utilities/types.h"
#include "util/types.hpp"
#include <vector>
#include <bitset>

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

@ -12,4 +12,4 @@
#include <vulkan/vulkan.h>
#include <vulkan/vk_sdk_platform.h>
#include "define_new_memleakdetect.h"
#include "Utilities/types.h"
#include "util/types.hpp"

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

@ -1,5 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
namespace rsx
{

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

@ -1,5 +1,6 @@
#pragma once
#include <Utilities/types.h>
#include "util/types.hpp"
#include <string>
#include <functional>

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

@ -1,5 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/BitField.h"
#include "Utilities/StrFmt.h"
#include <tuple>

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

@ -2,7 +2,7 @@
#include "gcm_enums.h"
#include "Utilities/types.h"
#include "util/types.hpp"
#include "rsx_utils.h"
namespace rsx

2
rpcs3/Emu/perf_meter.hpp
View file

@ -1,6 +1,6 @@
#pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "util/logs.hpp"
#include "Utilities/sysinfo.h"
#include "system_config.h"