mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-04 14:01:25 +12:00
Remove -Wno-reorder and make it an error
This commit is contained in:
parent
54f2c27ba0
commit
972e0ab31d
43 changed files with 139 additions and 149 deletions
|
@ -884,7 +884,6 @@ std::vector<fs::file> SCEDecrypter::MakeFile()
|
||||||
SELFDecrypter::SELFDecrypter(const fs::file& s)
|
SELFDecrypter::SELFDecrypter(const fs::file& s)
|
||||||
: self_f(s)
|
: self_f(s)
|
||||||
, key_v()
|
, key_v()
|
||||||
, data_buf_length(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -414,7 +414,7 @@ class SELFDecrypter
|
||||||
std::unique_ptr<u8[]> data_keys;
|
std::unique_ptr<u8[]> data_keys;
|
||||||
u32 data_keys_length;
|
u32 data_keys_length;
|
||||||
std::unique_ptr<u8[]> data_buf;
|
std::unique_ptr<u8[]> data_buf;
|
||||||
u32 data_buf_length;
|
u32 data_buf_length = 0;
|
||||||
|
|
||||||
// Main key vault instance.
|
// Main key vault instance.
|
||||||
KeyVault key_v;
|
KeyVault key_v;
|
||||||
|
|
|
@ -15,8 +15,8 @@ struct WAVHeader
|
||||||
|
|
||||||
RIFFHeader(u32 size)
|
RIFFHeader(u32 size)
|
||||||
: ID("RIFF"_u32)
|
: ID("RIFF"_u32)
|
||||||
, WAVE("WAVE"_u32)
|
|
||||||
, Size(size)
|
, Size(size)
|
||||||
|
, WAVE("WAVE"_u32)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
} RIFF;
|
} RIFF;
|
||||||
|
@ -53,10 +53,10 @@ struct WAVHeader
|
||||||
WAVHeader() = default;
|
WAVHeader() = default;
|
||||||
|
|
||||||
WAVHeader(u16 ch)
|
WAVHeader(u16 ch)
|
||||||
: ID("data"_u32)
|
: RIFF(sizeof(RIFFHeader) + sizeof(FMTHeader))
|
||||||
, Size(0)
|
|
||||||
, FMT(ch)
|
, FMT(ch)
|
||||||
, RIFF(sizeof(RIFFHeader) + sizeof(FMTHeader))
|
, ID("data"_u32)
|
||||||
|
, Size(0)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -264,15 +264,15 @@ class AudioDecoder : public ppu_thread
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
squeue_t<AdecTask> job;
|
squeue_t<AdecTask> job;
|
||||||
volatile bool is_closed;
|
volatile bool is_closed = false;
|
||||||
volatile bool is_finished;
|
volatile bool is_finished = false;
|
||||||
bool just_started;
|
bool just_started = false;
|
||||||
bool just_finished;
|
bool just_finished = false;
|
||||||
|
|
||||||
AVCodec* codec;
|
AVCodec* codec = nullptr;
|
||||||
AVInputFormat* input_format;
|
AVInputFormat* input_format = nullptr;
|
||||||
AVCodecContext* ctx;
|
AVCodecContext* ctx = nullptr;
|
||||||
AVFormatContext* fmt;
|
AVFormatContext* fmt = nullptr;
|
||||||
u8* io_buf;
|
u8* io_buf;
|
||||||
|
|
||||||
struct AudioReader
|
struct AudioReader
|
||||||
|
@ -296,7 +296,7 @@ public:
|
||||||
const u32 memSize;
|
const u32 memSize;
|
||||||
const vm::ptr<CellAdecCbMsg> cbFunc;
|
const vm::ptr<CellAdecCbMsg> cbFunc;
|
||||||
const u32 cbArg;
|
const u32 cbArg;
|
||||||
u32 memBias;
|
u32 memBias = 0;
|
||||||
|
|
||||||
AdecTask task;
|
AdecTask task;
|
||||||
u64 last_pts, first_pts;
|
u64 last_pts, first_pts;
|
||||||
|
@ -312,17 +312,8 @@ public:
|
||||||
, type(type)
|
, type(type)
|
||||||
, memAddr(addr)
|
, memAddr(addr)
|
||||||
, memSize(size)
|
, memSize(size)
|
||||||
, memBias(0)
|
|
||||||
, cbFunc(func)
|
, cbFunc(func)
|
||||||
, cbArg(arg)
|
, cbArg(arg)
|
||||||
, is_closed(false)
|
|
||||||
, is_finished(false)
|
|
||||||
, just_started(false)
|
|
||||||
, just_finished(false)
|
|
||||||
, codec(nullptr)
|
|
||||||
, input_format(nullptr)
|
|
||||||
, ctx(nullptr)
|
|
||||||
, fmt(nullptr)
|
|
||||||
{
|
{
|
||||||
av_register_all();
|
av_register_all();
|
||||||
avcodec_register_all();
|
avcodec_register_all();
|
||||||
|
|
|
@ -57,8 +57,8 @@ cell_audio_config::cell_audio_config()
|
||||||
|
|
||||||
|
|
||||||
audio_ringbuffer::audio_ringbuffer(cell_audio_config& _cfg)
|
audio_ringbuffer::audio_ringbuffer(cell_audio_config& _cfg)
|
||||||
: cfg(_cfg)
|
: backend(_cfg.backend)
|
||||||
, backend(_cfg.backend)
|
, cfg(_cfg)
|
||||||
, buf_sz(AUDIO_BUFFER_SAMPLES * _cfg.audio_channels)
|
, buf_sz(AUDIO_BUFFER_SAMPLES * _cfg.audio_channels)
|
||||||
, emu_paused(Emu.IsPaused())
|
, emu_paused(Emu.IsPaused())
|
||||||
{
|
{
|
||||||
|
|
|
@ -134,9 +134,9 @@ class ElementaryStream
|
||||||
std::mutex m_mutex;
|
std::mutex m_mutex;
|
||||||
|
|
||||||
squeue_t<u32> entries; // AU starting addresses
|
squeue_t<u32> entries; // AU starting addresses
|
||||||
u32 put_count; // number of AU written
|
u32 put_count = 0; // number of AU written
|
||||||
u32 got_count; // number of AU obtained by GetAu(Ex)
|
u32 got_count = 0; // number of AU obtained by GetAu(Ex)
|
||||||
u32 released; // number of AU released
|
u32 released = 0; // number of AU released
|
||||||
|
|
||||||
u32 put; // AU that is being written now
|
u32 put; // AU that is being written now
|
||||||
|
|
||||||
|
@ -162,9 +162,9 @@ public:
|
||||||
const u32 spec; //addr
|
const u32 spec; //addr
|
||||||
|
|
||||||
std::vector<u8> raw_data; // demultiplexed data stream (managed by demuxer thread)
|
std::vector<u8> raw_data; // demultiplexed data stream (managed by demuxer thread)
|
||||||
size_t raw_pos; // should be <= raw_data.size()
|
std::size_t raw_pos = 0; // should be <= raw_data.size()
|
||||||
u64 last_dts;
|
u64 last_dts = CODEC_TS_INVALID;
|
||||||
u64 last_pts;
|
u64 last_pts = CODEC_TS_INVALID;
|
||||||
|
|
||||||
void push(DemuxerStream& stream, u32 size); // called by demuxer thread (not multithread-safe)
|
void push(DemuxerStream& stream, u32 size); // called by demuxer thread (not multithread-safe)
|
||||||
|
|
||||||
|
@ -187,17 +187,13 @@ public:
|
||||||
const u32 memSize;
|
const u32 memSize;
|
||||||
const vm::ptr<CellDmuxCbMsg> cbFunc;
|
const vm::ptr<CellDmuxCbMsg> cbFunc;
|
||||||
const u32 cbArg;
|
const u32 cbArg;
|
||||||
volatile bool is_finished;
|
volatile bool is_finished = false;
|
||||||
volatile bool is_closed;
|
volatile bool is_closed = false;
|
||||||
atomic_t<bool> is_running;
|
atomic_t<bool> is_running = false;
|
||||||
atomic_t<bool> is_working;
|
atomic_t<bool> is_working = false;
|
||||||
|
|
||||||
Demuxer(u32 addr, u32 size, vm::ptr<CellDmuxCbMsg> func, u32 arg)
|
Demuxer(u32 addr, u32 size, vm::ptr<CellDmuxCbMsg> func, u32 arg)
|
||||||
: ppu_thread({}, "", 0)
|
: ppu_thread({}, "", 0)
|
||||||
, is_finished(false)
|
|
||||||
, is_closed(false)
|
|
||||||
, is_running(false)
|
|
||||||
, is_working(false)
|
|
||||||
, memAddr(addr)
|
, memAddr(addr)
|
||||||
, memSize(size)
|
, memSize(size)
|
||||||
, cbFunc(func)
|
, cbFunc(func)
|
||||||
|
@ -738,7 +734,8 @@ PesHeader::PesHeader(DemuxerStream& stream)
|
||||||
}
|
}
|
||||||
|
|
||||||
ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr<CellDmuxCbEsMsg> cbFunc, u32 cbArg, u32 spec)
|
ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMajor, u32 fidMinor, u32 sup1, u32 sup2, vm::ptr<CellDmuxCbEsMsg> cbFunc, u32 cbArg, u32 spec)
|
||||||
: dmux(dmux)
|
: put(align(addr, 128))
|
||||||
|
, dmux(dmux)
|
||||||
, memAddr(align(addr, 128))
|
, memAddr(align(addr, 128))
|
||||||
, memSize(size - (addr - memAddr))
|
, memSize(size - (addr - memAddr))
|
||||||
, fidMajor(fidMajor)
|
, fidMajor(fidMajor)
|
||||||
|
@ -748,13 +745,6 @@ ElementaryStream::ElementaryStream(Demuxer* dmux, u32 addr, u32 size, u32 fidMaj
|
||||||
, cbFunc(cbFunc)
|
, cbFunc(cbFunc)
|
||||||
, cbArg(cbArg)
|
, cbArg(cbArg)
|
||||||
, spec(spec)
|
, spec(spec)
|
||||||
, put(align(addr, 128))
|
|
||||||
, put_count(0)
|
|
||||||
, got_count(0)
|
|
||||||
, released(0)
|
|
||||||
, raw_pos(0)
|
|
||||||
, last_dts(CODEC_TS_INVALID)
|
|
||||||
, last_pts(CODEC_TS_INVALID)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -716,8 +716,8 @@ ppu_thread::ppu_thread(const ppu_thread_params& param, std::string_view name, u3
|
||||||
, prio(prio)
|
, prio(prio)
|
||||||
, stack_size(param.stack_size)
|
, stack_size(param.stack_size)
|
||||||
, stack_addr(param.stack_addr)
|
, stack_addr(param.stack_addr)
|
||||||
, start_time(get_guest_system_time())
|
|
||||||
, joiner(-!!detached)
|
, joiner(-!!detached)
|
||||||
|
, start_time(get_guest_system_time())
|
||||||
, ppu_name(name)
|
, ppu_name(name)
|
||||||
{
|
{
|
||||||
gpr[1] = stack_addr + stack_size - 0x70;
|
gpr[1] = stack_addr + stack_size - 0x70;
|
||||||
|
|
|
@ -1233,11 +1233,11 @@ spu_thread::~spu_thread()
|
||||||
|
|
||||||
spu_thread::spu_thread(vm::addr_t ls, lv2_spu_group* group, u32 index, std::string_view name, u32 lv2_id)
|
spu_thread::spu_thread(vm::addr_t ls, lv2_spu_group* group, u32 index, std::string_view name, u32 lv2_id)
|
||||||
: cpu_thread(idm::last_id())
|
: cpu_thread(idm::last_id())
|
||||||
, spu_name(name)
|
|
||||||
, index(index)
|
, index(index)
|
||||||
, offset(ls)
|
, offset(ls)
|
||||||
, group(group)
|
, group(group)
|
||||||
, lv2_id(lv2_id)
|
, lv2_id(lv2_id)
|
||||||
|
, spu_name(name)
|
||||||
{
|
{
|
||||||
if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit)
|
if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,8 +33,8 @@ struct lv2_cond final : lv2_obj
|
||||||
|
|
||||||
lv2_cond(u32 shared, s32 flags, u64 key, u64 name, std::shared_ptr<lv2_mutex> mutex)
|
lv2_cond(u32 shared, s32 flags, u64 key, u64 name, std::shared_ptr<lv2_mutex> mutex)
|
||||||
: shared(shared)
|
: shared(shared)
|
||||||
, key(key)
|
|
||||||
, flags(flags)
|
, flags(flags)
|
||||||
|
, key(key)
|
||||||
, name(name)
|
, name(name)
|
||||||
, mutex(std::move(mutex))
|
, mutex(std::move(mutex))
|
||||||
{
|
{
|
||||||
|
|
|
@ -45,8 +45,8 @@ struct lv2_mutex final : lv2_obj
|
||||||
, shared(shared)
|
, shared(shared)
|
||||||
, adaptive(adaptive)
|
, adaptive(adaptive)
|
||||||
, key(key)
|
, key(key)
|
||||||
, flags(flags)
|
|
||||||
, name(name)
|
, name(name)
|
||||||
|
, flags(flags)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,8 @@ struct lv2_rwlock final : lv2_obj
|
||||||
: protocol(protocol)
|
: protocol(protocol)
|
||||||
, shared(shared)
|
, shared(shared)
|
||||||
, key(key)
|
, key(key)
|
||||||
, flags(flags)
|
|
||||||
, name(name)
|
, name(name)
|
||||||
|
, flags(flags)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -38,8 +38,8 @@ struct lv2_sema final : lv2_obj
|
||||||
: protocol(protocol)
|
: protocol(protocol)
|
||||||
, shared(shared)
|
, shared(shared)
|
||||||
, key(key)
|
, key(key)
|
||||||
, flags(flags)
|
|
||||||
, name(name)
|
, name(name)
|
||||||
|
, flags(flags)
|
||||||
, max(max)
|
, max(max)
|
||||||
, val(value)
|
, val(value)
|
||||||
{
|
{
|
||||||
|
|
|
@ -273,16 +273,16 @@ struct lv2_spu_group
|
||||||
std::weak_ptr<lv2_event_queue> ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE
|
std::weak_ptr<lv2_event_queue> ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE
|
||||||
|
|
||||||
lv2_spu_group(std::string name, u32 num, s32 prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size)
|
lv2_spu_group(std::string name, u32 num, s32 prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size)
|
||||||
: id(idm::last_id())
|
: name(std::move(name))
|
||||||
, name(name)
|
, id(idm::last_id())
|
||||||
, max_num(num)
|
, max_num(num)
|
||||||
, max_run(num)
|
|
||||||
, mem_size(mem_size)
|
, mem_size(mem_size)
|
||||||
, init(0)
|
|
||||||
, prio(prio)
|
|
||||||
, type(type)
|
, type(type)
|
||||||
, ct(ct)
|
, ct(ct)
|
||||||
, has_scheduler_context(uses_scheduler)
|
, has_scheduler_context(uses_scheduler)
|
||||||
|
, max_run(num)
|
||||||
|
, init(0)
|
||||||
|
, prio(prio)
|
||||||
, run_state(SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED)
|
, run_state(SPU_THREAD_GROUP_STATUS_NOT_INITIALIZED)
|
||||||
, exit_status(0)
|
, exit_status(0)
|
||||||
, join_state(0)
|
, join_state(0)
|
||||||
|
|
|
@ -9,9 +9,9 @@ extern u64 get_timebased_time();
|
||||||
|
|
||||||
sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize)
|
sys_vm_t::sys_vm_t(u32 _addr, u32 vsize, lv2_memory_container* ct, u32 psize)
|
||||||
: ct(ct)
|
: ct(ct)
|
||||||
, psize(psize)
|
|
||||||
, addr(_addr)
|
, addr(_addr)
|
||||||
, size(vsize)
|
, size(vsize)
|
||||||
|
, psize(psize)
|
||||||
{
|
{
|
||||||
// Write ID
|
// Write ID
|
||||||
g_ids[addr >> 28].release(idm::last_id());
|
g_ids[addr >> 28].release(idm::last_id());
|
||||||
|
|
|
@ -62,11 +62,10 @@ struct KbButton
|
||||||
{
|
{
|
||||||
u32 m_keyCode;
|
u32 m_keyCode;
|
||||||
u32 m_outKeyCode;
|
u32 m_outKeyCode;
|
||||||
bool m_pressed;
|
bool m_pressed = false;
|
||||||
|
|
||||||
KbButton(u32 keyCode, u32 outKeyCode)
|
KbButton(u32 keyCode, u32 outKeyCode)
|
||||||
: m_pressed(false)
|
: m_keyCode(keyCode)
|
||||||
, m_keyCode(keyCode)
|
|
||||||
, m_outKeyCode(outKeyCode)
|
, m_outKeyCode(outKeyCode)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -74,7 +73,7 @@ struct KbButton
|
||||||
|
|
||||||
struct Keyboard
|
struct Keyboard
|
||||||
{
|
{
|
||||||
bool m_key_repeat; // for future use
|
bool m_key_repeat = false; // for future use
|
||||||
KbData m_data;
|
KbData m_data;
|
||||||
KbConfig m_config;
|
KbConfig m_config;
|
||||||
std::vector<KbButton> m_buttons;
|
std::vector<KbButton> m_buttons;
|
||||||
|
@ -82,7 +81,6 @@ struct Keyboard
|
||||||
Keyboard()
|
Keyboard()
|
||||||
: m_data()
|
: m_data()
|
||||||
, m_config()
|
, m_config()
|
||||||
, m_key_repeat(false)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -109,15 +109,13 @@ struct Button
|
||||||
u32 m_offset;
|
u32 m_offset;
|
||||||
u32 m_keyCode;
|
u32 m_keyCode;
|
||||||
u32 m_outKeyCode;
|
u32 m_outKeyCode;
|
||||||
u16 m_value;
|
u16 m_value = 0;
|
||||||
bool m_pressed;
|
bool m_pressed = false;
|
||||||
|
|
||||||
Button(u32 offset, u32 keyCode, u32 outKeyCode)
|
Button(u32 offset, u32 keyCode, u32 outKeyCode)
|
||||||
: m_pressed(false)
|
: m_offset(offset)
|
||||||
, m_offset(offset)
|
|
||||||
, m_keyCode(keyCode)
|
, m_keyCode(keyCode)
|
||||||
, m_outKeyCode(outKeyCode)
|
, m_outKeyCode(outKeyCode)
|
||||||
, m_value(0)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -127,13 +125,12 @@ struct AnalogStick
|
||||||
u32 m_offset;
|
u32 m_offset;
|
||||||
u32 m_keyCodeMin;
|
u32 m_keyCodeMin;
|
||||||
u32 m_keyCodeMax;
|
u32 m_keyCodeMax;
|
||||||
u16 m_value;
|
u16 m_value = 128;
|
||||||
|
|
||||||
AnalogStick(u32 offset, u32 keyCodeMin, u32 keyCodeMax)
|
AnalogStick(u32 offset, u32 keyCodeMin, u32 keyCodeMax)
|
||||||
: m_offset(offset)
|
: m_offset(offset)
|
||||||
, m_keyCodeMin(keyCodeMin)
|
, m_keyCodeMin(keyCodeMin)
|
||||||
, m_keyCodeMax(keyCodeMax)
|
, m_keyCodeMax(keyCodeMax)
|
||||||
, m_value(128)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -120,17 +120,17 @@ class CgBinaryDisasm
|
||||||
|
|
||||||
std::string m_path; // used for FP decompiler thread, delete this later
|
std::string m_path; // used for FP decompiler thread, delete this later
|
||||||
|
|
||||||
u8* m_buffer;
|
u8* m_buffer = nullptr;
|
||||||
size_t m_buffer_size;
|
std::size_t m_buffer_size = 0;
|
||||||
std::string m_arb_shader;
|
std::string m_arb_shader;
|
||||||
std::string m_glsl_shader;
|
std::string m_glsl_shader;
|
||||||
std::string m_dst_reg_name;
|
std::string m_dst_reg_name;
|
||||||
|
|
||||||
// FP members
|
// FP members
|
||||||
u32 m_offset;
|
u32 m_offset = 0;
|
||||||
u32 m_opcode;
|
u32 m_opcode = 0;
|
||||||
u32 m_step;
|
u32 m_step = 0;
|
||||||
u32 m_size;
|
u32 m_size = 0;
|
||||||
std::vector<u32> m_end_offsets;
|
std::vector<u32> m_end_offsets;
|
||||||
std::vector<u32> m_else_offsets;
|
std::vector<u32> m_else_offsets;
|
||||||
std::vector<u32> m_loop_end_offsets;
|
std::vector<u32> m_loop_end_offsets;
|
||||||
|
@ -179,14 +179,6 @@ public:
|
||||||
|
|
||||||
CgBinaryDisasm(const std::string& path)
|
CgBinaryDisasm(const std::string& path)
|
||||||
: m_path(path)
|
: m_path(path)
|
||||||
, m_buffer(nullptr)
|
|
||||||
, m_buffer_size(0)
|
|
||||||
, m_offset(0)
|
|
||||||
, m_opcode(0)
|
|
||||||
, m_step(0)
|
|
||||||
, m_size(0)
|
|
||||||
, m_arb_shader("")
|
|
||||||
, m_dst_reg_name("")
|
|
||||||
{
|
{
|
||||||
fs::file f(path);
|
fs::file f(path);
|
||||||
if (!f) return;
|
if (!f) return;
|
||||||
|
|
|
@ -6,12 +6,10 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
FragmentProgramDecompiler::FragmentProgramDecompiler(const RSXFragmentProgram &prog, u32& size) :
|
FragmentProgramDecompiler::FragmentProgramDecompiler(const RSXFragmentProgram &prog, u32& size)
|
||||||
m_prog(prog),
|
: m_size(size)
|
||||||
m_size(size),
|
, m_prog(prog)
|
||||||
m_const_index(0),
|
, m_ctrl(prog.ctrl)
|
||||||
m_location(0),
|
|
||||||
m_ctrl(prog.ctrl)
|
|
||||||
{
|
{
|
||||||
m_size = 0;
|
m_size = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -146,9 +146,9 @@ class FragmentProgramDecompiler
|
||||||
|
|
||||||
std::string main;
|
std::string main;
|
||||||
u32& m_size;
|
u32& m_size;
|
||||||
u32 m_const_index;
|
u32 m_const_index = 0;
|
||||||
u32 m_offset;
|
u32 m_offset;
|
||||||
u32 m_location;
|
u32 m_location = 0;
|
||||||
|
|
||||||
u32 m_loop_count;
|
u32 m_loop_count;
|
||||||
int m_code_level;
|
int m_code_level;
|
||||||
|
|
|
@ -151,7 +151,11 @@ namespace rsx
|
||||||
deferred_subresource(image_resource_type _res, deferred_request_command _op,
|
deferred_subresource(image_resource_type _res, deferred_request_command _op,
|
||||||
const image_section_attributes_t& attr, position2u offset,
|
const image_section_attributes_t& attr, position2u offset,
|
||||||
texture_channel_remap_t _remap)
|
texture_channel_remap_t _remap)
|
||||||
: external_handle(_res), op(_op), x(offset.x), y(offset.y), remap(std::move(_remap))
|
: external_handle(_res)
|
||||||
|
, remap(std::move(_remap))
|
||||||
|
, op(_op)
|
||||||
|
, x(offset.x)
|
||||||
|
, y(offset.y)
|
||||||
{
|
{
|
||||||
static_cast<image_section_attributes_t&>(*this) = attr;
|
static_cast<image_section_attributes_t&>(*this) = attr;
|
||||||
}
|
}
|
||||||
|
|
|
@ -742,14 +742,15 @@ namespace rsx
|
||||||
|
|
||||||
// Constructors
|
// Constructors
|
||||||
range_iterator_tmpl() = default; // end iterator
|
range_iterator_tmpl() = default; // end iterator
|
||||||
explicit range_iterator_tmpl(parent_type &storage, const address_range &_range, section_bounds _bounds, bool _locked_only) :
|
|
||||||
range(_range),
|
explicit range_iterator_tmpl(parent_type &storage, const address_range &_range, section_bounds _bounds, bool _locked_only)
|
||||||
bounds(_bounds),
|
: range(_range)
|
||||||
block(&storage.block_for(range.start)),
|
, bounds(_bounds)
|
||||||
unowned_it(block->unowned_begin()),
|
, block(&storage.block_for(range.start))
|
||||||
unowned_remaining(true),
|
, unowned_remaining(true)
|
||||||
cur_block_it(block->begin()),
|
, unowned_it(block->unowned_begin())
|
||||||
locked_only(_locked_only)
|
, cur_block_it(block->begin())
|
||||||
|
, locked_only(_locked_only)
|
||||||
{
|
{
|
||||||
// do a "fake" iteration to ensure the internal state is consistent
|
// do a "fake" iteration to ensure the internal state is consistent
|
||||||
next(false);
|
next(false);
|
||||||
|
|
|
@ -32,19 +32,19 @@ namespace rsx
|
||||||
u32 aux_param1;
|
u32 aux_param1;
|
||||||
|
|
||||||
transport_packet(void *_dst, void *_src, u32 len)
|
transport_packet(void *_dst, void *_src, u32 len)
|
||||||
: src(_src), dst(_dst), length(len), type(op::raw_copy)
|
: type(op::raw_copy), src(_src), dst(_dst), length(len)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
transport_packet(void *_dst, std::vector<u8>& _src, u32 len)
|
transport_packet(void *_dst, std::vector<u8>& _src, u32 len)
|
||||||
: dst(_dst), opt_storage(std::move(_src)), length(len), type(op::vector_copy)
|
: type(op::vector_copy), opt_storage(std::move(_src)), dst(_dst), length(len)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
transport_packet(void *_dst, rsx::primitive_type prim, u32 len)
|
transport_packet(void *_dst, rsx::primitive_type prim, u32 len)
|
||||||
: dst(_dst), aux_param0(static_cast<u8>(prim)), length(len), type(op::index_emulate)
|
: type(op::index_emulate), dst(_dst), length(len), aux_param0(static_cast<u8>(prim))
|
||||||
{}
|
{}
|
||||||
|
|
||||||
transport_packet(u32 command, void* args)
|
transport_packet(u32 command, void* args)
|
||||||
: aux_param0(command), src(args), type(op::callback)
|
: type(op::callback), src(args), aux_param0(command)
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1322,7 +1322,8 @@ private:
|
||||||
VkImageTiling tiling,
|
VkImageTiling tiling,
|
||||||
VkImageUsageFlags usage,
|
VkImageUsageFlags usage,
|
||||||
VkImageCreateFlags image_flags)
|
VkImageCreateFlags image_flags)
|
||||||
: m_device(dev), current_layout(initial_layout)
|
: current_layout(initial_layout)
|
||||||
|
, m_device(dev)
|
||||||
{
|
{
|
||||||
info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
|
info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
|
||||||
info.imageType = image_type;
|
info.imageType = image_type;
|
||||||
|
@ -1448,7 +1449,8 @@ private:
|
||||||
}
|
}
|
||||||
|
|
||||||
image_view(VkDevice dev, VkImageViewCreateInfo create_info)
|
image_view(VkDevice dev, VkImageViewCreateInfo create_info)
|
||||||
: m_device(dev), info(create_info)
|
: info(create_info)
|
||||||
|
, m_device(dev)
|
||||||
{
|
{
|
||||||
create_impl();
|
create_impl();
|
||||||
}
|
}
|
||||||
|
@ -1781,7 +1783,8 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
framebuffer(VkDevice dev, VkRenderPass pass, u32 width, u32 height, std::vector<std::unique_ptr<vk::image_view>> &&atts)
|
framebuffer(VkDevice dev, VkRenderPass pass, u32 width, u32 height, std::vector<std::unique_ptr<vk::image_view>> &&atts)
|
||||||
: m_device(dev), attachments(std::move(atts))
|
: attachments(std::move(atts))
|
||||||
|
, m_device(dev)
|
||||||
{
|
{
|
||||||
std::vector<VkImageView> image_view_array(attachments.size());
|
std::vector<VkImageView> image_view_array(attachments.size());
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
|
|
|
@ -36,8 +36,8 @@ public:
|
||||||
VKVertexDecompilerThread(const RSXVertexProgram &prog, std::string& shader, ParamArray&, class VKVertexProgram &dst)
|
VKVertexDecompilerThread(const RSXVertexProgram &prog, std::string& shader, ParamArray&, class VKVertexProgram &dst)
|
||||||
: VertexProgramDecompiler(prog)
|
: VertexProgramDecompiler(prog)
|
||||||
, m_shader(shader)
|
, m_shader(shader)
|
||||||
, rsx_vertex_program(prog)
|
|
||||||
, vk_prog(&dst)
|
, vk_prog(&dst)
|
||||||
|
, rsx_vertex_program(prog)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
data_array_format_info(int id, std::array<u32, 0x10000 / 4>& r)
|
data_array_format_info(int id, std::array<u32, 0x10000 / 4>& r)
|
||||||
: registers(r)
|
: index(id)
|
||||||
, index(id)
|
, registers(r)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,9 @@ bool keyboard_pad_handler::Init()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
keyboard_pad_handler::keyboard_pad_handler() : PadHandlerBase(pad_handler::keyboard), QObject()
|
keyboard_pad_handler::keyboard_pad_handler()
|
||||||
|
: QObject()
|
||||||
|
, PadHandlerBase(pad_handler::keyboard)
|
||||||
{
|
{
|
||||||
init_configs();
|
init_configs();
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@ namespace psf
|
||||||
|
|
||||||
class entry final
|
class entry final
|
||||||
{
|
{
|
||||||
std::string m_value_string;
|
|
||||||
u32 m_value_integer; // TODO: is it really unsigned?
|
|
||||||
u32 m_max_size; // Entry max size (supplementary info, stored in PSF format)
|
|
||||||
format m_type;
|
format m_type;
|
||||||
|
u32 m_max_size; // Entry max size (supplementary info, stored in PSF format)
|
||||||
|
u32 m_value_integer; // TODO: is it really unsigned?
|
||||||
|
std::string m_value_string;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Construct string entry, assign the value
|
// Construct string entry, assign the value
|
||||||
|
|
|
@ -30,10 +30,10 @@ else()
|
||||||
|
|
||||||
add_compile_options(-Werror=old-style-cast)
|
add_compile_options(-Werror=old-style-cast)
|
||||||
add_compile_options(-Werror=sign-compare)
|
add_compile_options(-Werror=sign-compare)
|
||||||
|
add_compile_options(-Werror=reorder)
|
||||||
|
|
||||||
#TODO Clean the code so these are removed
|
#TODO Clean the code so these are removed
|
||||||
add_compile_options(-Wno-unused-variable)
|
add_compile_options(-Wno-unused-variable)
|
||||||
add_compile_options(-Wno-reorder)
|
|
||||||
add_compile_options(-Wno-unknown-pragmas)
|
add_compile_options(-Wno-unknown-pragmas)
|
||||||
add_compile_options(-Wno-invalid-offsetof)
|
add_compile_options(-Wno-invalid-offsetof)
|
||||||
add_compile_options(-Wno-unused-function)
|
add_compile_options(-Wno-unused-function)
|
||||||
|
|
|
@ -11,8 +11,10 @@
|
||||||
|
|
||||||
constexpr auto qstr = QString::fromStdString;
|
constexpr auto qstr = QString::fromStdString;
|
||||||
|
|
||||||
debugger_list::debugger_list(QWidget* parent, std::shared_ptr<gui_settings> settings, breakpoint_handler* handler) : QListWidget(parent), m_breakpoint_handler(handler),
|
debugger_list::debugger_list(QWidget* parent, std::shared_ptr<gui_settings> settings, breakpoint_handler* handler)
|
||||||
xgui_settings(settings), m_pc(0), m_item_count(30)
|
: QListWidget(parent)
|
||||||
|
, xgui_settings(settings)
|
||||||
|
, m_breakpoint_handler(handler)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("ASM"));
|
setWindowTitle(tr("ASM"));
|
||||||
for (uint i = 0; i < m_item_count; ++i)
|
for (uint i = 0; i < m_item_count; ++i)
|
||||||
|
|
|
@ -13,8 +13,8 @@ class debugger_list : public QListWidget
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
u32 m_pc;
|
u32 m_pc = 0;
|
||||||
u32 m_item_count;
|
u32 m_item_count = 30;
|
||||||
bool m_no_thread_selected;
|
bool m_no_thread_selected;
|
||||||
QColor m_color_bp;
|
QColor m_color_bp;
|
||||||
QColor m_color_pc;
|
QColor m_color_pc;
|
||||||
|
|
|
@ -169,9 +169,16 @@ public:
|
||||||
bool has_msaa = false;
|
bool has_msaa = false;
|
||||||
|
|
||||||
Render_Info() = default;
|
Render_Info() = default;
|
||||||
explicit Render_Info(QString name) : name(std::move(name)), has_adapters(false) {}
|
explicit Render_Info(QString name)
|
||||||
|
: name(std::move(name))
|
||||||
|
, has_adapters(false) {}
|
||||||
|
|
||||||
Render_Info(QString name, QStringList adapters, bool supported, SettingsType type, bool has_msaa)
|
Render_Info(QString name, QStringList adapters, bool supported, SettingsType type, bool has_msaa)
|
||||||
: name(std::move(name)), adapters(std::move(adapters)), supported(supported), type(type), has_msaa(has_msaa) {}
|
: name(std::move(name))
|
||||||
|
, adapters(std::move(adapters))
|
||||||
|
, type(type)
|
||||||
|
, supported(supported)
|
||||||
|
, has_msaa(has_msaa) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct Render_Creator
|
struct Render_Creator
|
||||||
|
|
|
@ -9,8 +9,8 @@ extern bool ppu_patch(u32 addr, u32 value);
|
||||||
instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr<cpu_thread>& _cpu, CPUDisAsm* _disasm)
|
instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr<cpu_thread>& _cpu, CPUDisAsm* _disasm)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
, m_pc(_pc)
|
, m_pc(_pc)
|
||||||
, cpu(_cpu)
|
|
||||||
, m_disasm(_disasm)
|
, m_disasm(_disasm)
|
||||||
|
, cpu(_cpu)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Edit instruction"));
|
setWindowTitle(tr("Edit instruction"));
|
||||||
setAttribute(Qt::WA_DeleteOnClose);
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
|
|
@ -62,11 +62,10 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); }
|
||||||
|
|
||||||
main_window::main_window(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, std::shared_ptr<persistent_settings> persistent_settings, QWidget *parent)
|
main_window::main_window(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, std::shared_ptr<persistent_settings> persistent_settings, QWidget *parent)
|
||||||
: QMainWindow(parent)
|
: QMainWindow(parent)
|
||||||
|
, ui(new Ui::main_window)
|
||||||
, guiSettings(guiSettings)
|
, guiSettings(guiSettings)
|
||||||
, emuSettings(emuSettings)
|
, emuSettings(emuSettings)
|
||||||
, m_persistent_settings(persistent_settings)
|
, m_persistent_settings(persistent_settings)
|
||||||
, m_sys_menu_opened(false)
|
|
||||||
, ui(new Ui::main_window)
|
|
||||||
{
|
{
|
||||||
Q_INIT_RESOURCE(resources);
|
Q_INIT_RESOURCE(resources);
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@ inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); }
|
||||||
register_editor_dialog::register_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr<cpu_thread>& _cpu, CPUDisAsm* _disasm)
|
register_editor_dialog::register_editor_dialog(QWidget *parent, u32 _pc, const std::shared_ptr<cpu_thread>& _cpu, CPUDisAsm* _disasm)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
, m_pc(_pc)
|
, m_pc(_pc)
|
||||||
, cpu(_cpu)
|
|
||||||
, m_disasm(_disasm)
|
, m_disasm(_disasm)
|
||||||
|
, cpu(_cpu)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Edit registers"));
|
setWindowTitle(tr("Edit registers"));
|
||||||
setAttribute(Qt::WA_DeleteOnClose);
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
|
|
|
@ -24,9 +24,6 @@ namespace
|
||||||
rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget* parent)
|
rsx_debugger::rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget* parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
, m_gui_settings(gui_settings)
|
, m_gui_settings(gui_settings)
|
||||||
, m_addr(0x0)
|
|
||||||
, m_cur_texture(0)
|
|
||||||
, exit(false)
|
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("RSX Debugger"));
|
setWindowTitle(tr("RSX Debugger"));
|
||||||
setObjectName("rsx_debugger");
|
setObjectName("rsx_debugger");
|
||||||
|
@ -327,7 +324,9 @@ bool rsx_debugger::eventFilter(QObject* object, QEvent* event)
|
||||||
}
|
}
|
||||||
|
|
||||||
Buffer::Buffer(bool isTex, u32 id, const QString& name, QWidget* parent)
|
Buffer::Buffer(bool isTex, u32 id, const QString& name, QWidget* parent)
|
||||||
: QGroupBox(name, parent), m_isTex(isTex), m_id(id)
|
: QGroupBox(name, parent)
|
||||||
|
, m_id(id)
|
||||||
|
, m_isTex(isTex)
|
||||||
{
|
{
|
||||||
m_image_size = isTex ? Texture_Size : Panel_Size;
|
m_image_size = isTex ? Texture_Size : Panel_Size;
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ class rsx_debugger : public QDialog
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
u32 m_addr;
|
u32 m_addr = 0;
|
||||||
|
|
||||||
QLineEdit* m_addr_line;
|
QLineEdit* m_addr_line;
|
||||||
|
|
||||||
|
@ -62,12 +62,12 @@ class rsx_debugger : public QDialog
|
||||||
QLabel* m_text_transform_program;
|
QLabel* m_text_transform_program;
|
||||||
QLabel* m_text_shader_program;
|
QLabel* m_text_shader_program;
|
||||||
|
|
||||||
uint m_cur_texture;
|
uint m_cur_texture = 0;
|
||||||
|
|
||||||
std::shared_ptr<gui_settings> m_gui_settings;
|
std::shared_ptr<gui_settings> m_gui_settings;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool exit;
|
bool exit = false;
|
||||||
rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget* parent = 0);
|
rsx_debugger(std::shared_ptr<gui_settings> gui_settings, QWidget* parent = 0);
|
||||||
~rsx_debugger();
|
~rsx_debugger();
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,8 @@ constexpr auto qstr = QString::fromStdString;
|
||||||
//Show up the savedata list, either to choose one to save/load or to manage saves.
|
//Show up the savedata list, either to choose one to save/load or to manage saves.
|
||||||
//I suggest to use function callbacks to give save data list or get save data entry. (Not implemented or stubbed)
|
//I suggest to use function callbacks to give save data list or get save data entry. (Not implemented or stubbed)
|
||||||
save_data_list_dialog::save_data_list_dialog(const std::vector<SaveDataEntry>& entries, s32 focusedEntry, u32 op, vm::ptr<CellSaveDataListSet> listSet, QWidget* parent)
|
save_data_list_dialog::save_data_list_dialog(const std::vector<SaveDataEntry>& entries, s32 focusedEntry, u32 op, vm::ptr<CellSaveDataListSet> listSet, QWidget* parent)
|
||||||
: QDialog(parent), m_save_entries(entries), m_entry(selection_code::new_save), m_entry_label(nullptr), m_sort_column(0), m_sort_ascending(true)
|
: QDialog(parent)
|
||||||
|
, m_save_entries(entries)
|
||||||
{
|
{
|
||||||
if (op >= 8)
|
if (op >= 8)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,7 @@ private:
|
||||||
void UpdateSelectionLabel(void);
|
void UpdateSelectionLabel(void);
|
||||||
void UpdateList(void);
|
void UpdateList(void);
|
||||||
|
|
||||||
s32 m_entry;
|
s32 m_entry = selection_code::new_save;
|
||||||
QLabel* m_entry_label = nullptr;
|
QLabel* m_entry_label = nullptr;
|
||||||
|
|
||||||
QTableWidget* m_list = nullptr;
|
QTableWidget* m_list = nullptr;
|
||||||
|
@ -41,6 +41,6 @@ private:
|
||||||
|
|
||||||
std::shared_ptr<gui_settings> m_gui_settings;
|
std::shared_ptr<gui_settings> m_gui_settings;
|
||||||
|
|
||||||
int m_sort_column;
|
int m_sort_column = 0;
|
||||||
bool m_sort_ascending;
|
bool m_sort_ascending = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -94,7 +94,9 @@ namespace
|
||||||
}
|
}
|
||||||
|
|
||||||
save_manager_dialog::save_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::string dir, QWidget* parent)
|
save_manager_dialog::save_manager_dialog(std::shared_ptr<gui_settings> gui_settings, std::string dir, QWidget* parent)
|
||||||
: QDialog(parent), m_save_entries(), m_dir(dir), m_sort_column(1), m_sort_ascending(true), m_gui_settings(gui_settings)
|
: QDialog(parent)
|
||||||
|
, m_dir(dir)
|
||||||
|
, m_gui_settings(gui_settings)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Save Manager"));
|
setWindowTitle(tr("Save Manager"));
|
||||||
setMinimumSize(QSize(400, 400));
|
setMinimumSize(QSize(400, 400));
|
||||||
|
|
|
@ -44,8 +44,8 @@ private:
|
||||||
|
|
||||||
std::shared_ptr<gui_settings> m_gui_settings;
|
std::shared_ptr<gui_settings> m_gui_settings;
|
||||||
|
|
||||||
int m_sort_column;
|
int m_sort_column = 1;
|
||||||
bool m_sort_ascending;
|
bool m_sort_ascending = true;
|
||||||
QSize m_icon_size;
|
QSize m_icon_size;
|
||||||
QColor m_icon_color;
|
QColor m_icon_color;
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,11 @@ inline std::string sstr(const QString& _in) { return _in.toStdString(); }
|
||||||
inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); }
|
inline std::string sstr(const QVariant& _in) { return sstr(_in.toString()); }
|
||||||
|
|
||||||
settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, const int& tabIndex, QWidget *parent, const GameInfo* game)
|
settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std::shared_ptr<emu_settings> emuSettings, const int& tabIndex, QWidget *parent, const GameInfo* game)
|
||||||
: QDialog(parent), xgui_settings(guiSettings), xemu_settings(emuSettings), ui(new Ui::settings_dialog), m_tab_Index(tabIndex)
|
: QDialog(parent)
|
||||||
|
, m_tab_Index(tabIndex)
|
||||||
|
, ui(new Ui::settings_dialog)
|
||||||
|
, xgui_settings(guiSettings)
|
||||||
|
, xemu_settings(emuSettings)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
|
ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
|
||||||
|
|
|
@ -57,7 +57,8 @@ namespace
|
||||||
}
|
}
|
||||||
|
|
||||||
user_manager_dialog::user_manager_dialog(std::shared_ptr<gui_settings> gui_settings, QWidget* parent)
|
user_manager_dialog::user_manager_dialog(std::shared_ptr<gui_settings> gui_settings, QWidget* parent)
|
||||||
: QDialog(parent), m_user_list(), m_sort_column(1), m_sort_ascending(true), m_gui_settings(gui_settings)
|
: QDialog(parent)
|
||||||
|
, m_gui_settings(gui_settings)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("User Manager"));
|
setWindowTitle(tr("User Manager"));
|
||||||
setMinimumSize(QSize(500, 400));
|
setMinimumSize(QSize(500, 400));
|
||||||
|
|
|
@ -51,6 +51,6 @@ private:
|
||||||
|
|
||||||
std::shared_ptr<gui_settings> m_gui_settings;
|
std::shared_ptr<gui_settings> m_gui_settings;
|
||||||
|
|
||||||
int m_sort_column;
|
int m_sort_column = 1;
|
||||||
bool m_sort_ascending;
|
bool m_sort_ascending = true;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue