mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 10:53:24 +02:00
hle_ipc: Make constructors explicit where applicable
This commit is contained in:
parent
2a1daf8f83
commit
22fd3f0026
@ -25,9 +25,9 @@ protected:
|
|||||||
ptrdiff_t index = 0;
|
ptrdiff_t index = 0;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
RequestHelperBase(u32* command_buffer) : cmdbuf(command_buffer) {}
|
explicit RequestHelperBase(u32* command_buffer) : cmdbuf(command_buffer) {}
|
||||||
|
|
||||||
RequestHelperBase(Kernel::HLERequestContext& context)
|
explicit RequestHelperBase(Kernel::HLERequestContext& context)
|
||||||
: context(&context), cmdbuf(context.CommandBuffer()) {}
|
: context(&context), cmdbuf(context.CommandBuffer()) {}
|
||||||
|
|
||||||
void Skip(unsigned size_in_words, bool set_to_null) {
|
void Skip(unsigned size_in_words, bool set_to_null) {
|
||||||
@ -56,8 +56,6 @@ public:
|
|||||||
|
|
||||||
class ResponseBuilder : public RequestHelperBase {
|
class ResponseBuilder : public RequestHelperBase {
|
||||||
public:
|
public:
|
||||||
ResponseBuilder(u32* command_buffer) : RequestHelperBase(command_buffer) {}
|
|
||||||
|
|
||||||
/// Flags used for customizing the behavior of ResponseBuilder
|
/// Flags used for customizing the behavior of ResponseBuilder
|
||||||
enum class Flags : u32 {
|
enum class Flags : u32 {
|
||||||
None = 0,
|
None = 0,
|
||||||
@ -66,9 +64,11 @@ public:
|
|||||||
AlwaysMoveHandles = 1,
|
AlwaysMoveHandles = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
ResponseBuilder(Kernel::HLERequestContext& context, u32 normal_params_size,
|
explicit ResponseBuilder(u32* command_buffer) : RequestHelperBase(command_buffer) {}
|
||||||
u32 num_handles_to_copy = 0, u32 num_objects_to_move = 0,
|
|
||||||
Flags flags = Flags::None)
|
explicit ResponseBuilder(Kernel::HLERequestContext& context, u32 normal_params_size,
|
||||||
|
u32 num_handles_to_copy = 0, u32 num_objects_to_move = 0,
|
||||||
|
Flags flags = Flags::None)
|
||||||
|
|
||||||
: RequestHelperBase(context), normal_params_size(normal_params_size),
|
: RequestHelperBase(context), normal_params_size(normal_params_size),
|
||||||
num_handles_to_copy(num_handles_to_copy), num_objects_to_move(num_objects_to_move) {
|
num_handles_to_copy(num_handles_to_copy), num_objects_to_move(num_objects_to_move) {
|
||||||
@ -274,9 +274,9 @@ inline void ResponseBuilder::PushMoveObjects(Kernel::SharedPtr<O>... pointers) {
|
|||||||
|
|
||||||
class RequestParser : public RequestHelperBase {
|
class RequestParser : public RequestHelperBase {
|
||||||
public:
|
public:
|
||||||
RequestParser(u32* command_buffer) : RequestHelperBase(command_buffer) {}
|
explicit RequestParser(u32* command_buffer) : RequestHelperBase(command_buffer) {}
|
||||||
|
|
||||||
RequestParser(Kernel::HLERequestContext& context) : RequestHelperBase(context) {
|
explicit RequestParser(Kernel::HLERequestContext& context) : RequestHelperBase(context) {
|
||||||
ASSERT_MSG(context.GetDataPayloadOffset(), "context is incomplete");
|
ASSERT_MSG(context.GetDataPayloadOffset(), "context is incomplete");
|
||||||
Skip(context.GetDataPayloadOffset(), false);
|
Skip(context.GetDataPayloadOffset(), false);
|
||||||
// Skip the u64 command id, it's already stored in the context
|
// Skip the u64 command id, it's already stored in the context
|
||||||
@ -286,8 +286,9 @@ public:
|
|||||||
|
|
||||||
ResponseBuilder MakeBuilder(u32 normal_params_size, u32 num_handles_to_copy,
|
ResponseBuilder MakeBuilder(u32 normal_params_size, u32 num_handles_to_copy,
|
||||||
u32 num_handles_to_move,
|
u32 num_handles_to_move,
|
||||||
ResponseBuilder::Flags flags = ResponseBuilder::Flags::None) {
|
ResponseBuilder::Flags flags = ResponseBuilder::Flags::None) const {
|
||||||
return {*context, normal_params_size, num_handles_to_copy, num_handles_to_move, flags};
|
return ResponseBuilder{*context, normal_params_size, num_handles_to_copy,
|
||||||
|
num_handles_to_move, flags};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
|
@ -91,7 +91,7 @@ protected:
|
|||||||
*/
|
*/
|
||||||
class HLERequestContext {
|
class HLERequestContext {
|
||||||
public:
|
public:
|
||||||
HLERequestContext(SharedPtr<Kernel::ServerSession> session);
|
explicit HLERequestContext(SharedPtr<ServerSession> session);
|
||||||
~HLERequestContext();
|
~HLERequestContext();
|
||||||
|
|
||||||
/// Returns a pointer to the IPC command buffer for this request.
|
/// Returns a pointer to the IPC command buffer for this request.
|
||||||
|
Loading…
Reference in New Issue
Block a user