yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #90 from lioncash/vi-override 

vi: Minor clean up/correctness changes
This commit is contained in:
bunnei 2018-01-17 23:55:07 -05:00 committed by GitHub
parent cf0daed0b8 3d19102c48
commit ed788742bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/core/hle/service/vi/vi.cpp
View File

@ -26,7 +26,7 @@ public:
// This default size was chosen arbitrarily. // This default size was chosen arbitrarily.
static constexpr size_t DefaultBufferSize = 0x40; static constexpr size_t DefaultBufferSize = 0x40;
Parcel() : buffer(DefaultBufferSize) {} Parcel() : buffer(DefaultBufferSize) {}
Parcel(std::vector<u8> data) : buffer(std::move(data)) {} explicit Parcel(std::vector<u8> data) : buffer(std::move(data)) {}
virtual ~Parcel() = default; virtual ~Parcel() = default;
template <typename T> template <typename T>
@ -102,9 +102,9 @@ public:
} }
protected: protected:
virtual void SerializeData(){}; virtual void SerializeData() {}
virtual void DeserializeData(){}; virtual void DeserializeData() {}
private: private:
struct Header { struct Header {
@ -122,7 +122,7 @@ private:
class NativeWindow : public Parcel { class NativeWindow : public Parcel {
public: public:
NativeWindow(u32 id) : Parcel() { explicit NativeWindow(u32 id) : Parcel() {
data.id = id; data.id = id;
} }
~NativeWindow() override = default; ~NativeWindow() override = default;
@ -148,12 +148,12 @@ private:
class IGBPConnectRequestParcel : public Parcel { class IGBPConnectRequestParcel : public Parcel {
public: public:
IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { explicit IGBPConnectRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
Deserialize(); Deserialize();
} }
~IGBPConnectRequestParcel() override = default; ~IGBPConnectRequestParcel() override = default;
void DeserializeData() { void DeserializeData() override {
std::u16string token = ReadInterfaceToken(); std::u16string token = ReadInterfaceToken();
data = Read<Data>(); data = Read<Data>();
} }
@ -169,7 +169,7 @@ public:
class IGBPConnectResponseParcel : public Parcel { class IGBPConnectResponseParcel : public Parcel {
public: public:
IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() { explicit IGBPConnectResponseParcel(u32 width, u32 height) : Parcel() {
data.width = width; data.width = width;
data.height = height; data.height = height;
} }
@ -195,12 +195,13 @@ private:
class IGBPSetPreallocatedBufferRequestParcel : public Parcel { class IGBPSetPreallocatedBufferRequestParcel : public Parcel {
public: public:
IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { explicit IGBPSetPreallocatedBufferRequestParcel(const std::vector<u8>& buffer)
: Parcel(buffer) {
Deserialize(); Deserialize();
} }
~IGBPSetPreallocatedBufferRequestParcel() override = default; ~IGBPSetPreallocatedBufferRequestParcel() override = default;
void DeserializeData() { void DeserializeData() override {
std::u16string token = ReadInterfaceToken(); std::u16string token = ReadInterfaceToken();
data = Read<Data>(); data = Read<Data>();
ASSERT(data.graphic_buffer_length == sizeof(IGBPBuffer)); ASSERT(data.graphic_buffer_length == sizeof(IGBPBuffer));
@ -232,12 +233,12 @@ protected:
class IGBPDequeueBufferRequestParcel : public Parcel { class IGBPDequeueBufferRequestParcel : public Parcel {
public: public:
IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { explicit IGBPDequeueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
Deserialize(); Deserialize();
} }
~IGBPDequeueBufferRequestParcel() override = default; ~IGBPDequeueBufferRequestParcel() override = default;
void DeserializeData() { void DeserializeData() override {
std::u16string token = ReadInterfaceToken(); std::u16string token = ReadInterfaceToken();
data = Read<Data>(); data = Read<Data>();
} }
@ -255,7 +256,7 @@ public:
class IGBPDequeueBufferResponseParcel : public Parcel { class IGBPDequeueBufferResponseParcel : public Parcel {
public: public:
IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {} explicit IGBPDequeueBufferResponseParcel(u32 slot) : Parcel(), slot(slot) {}
~IGBPDequeueBufferResponseParcel() override = default; ~IGBPDequeueBufferResponseParcel() override = default;
protected: protected:
@ -272,12 +273,12 @@ protected:
class IGBPRequestBufferRequestParcel : public Parcel { class IGBPRequestBufferRequestParcel : public Parcel {
public: public:
IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { explicit IGBPRequestBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
Deserialize(); Deserialize();
} }
~IGBPRequestBufferRequestParcel() override = default; ~IGBPRequestBufferRequestParcel() override = default;
void DeserializeData() { void DeserializeData() override {
std::u16string token = ReadInterfaceToken(); std::u16string token = ReadInterfaceToken();
slot = Read<u32_le>(); slot = Read<u32_le>();
} }
@ -287,7 +288,7 @@ public:
class IGBPRequestBufferResponseParcel : public Parcel { class IGBPRequestBufferResponseParcel : public Parcel {
public: public:
IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {} explicit IGBPRequestBufferResponseParcel(IGBPBuffer buffer) : Parcel(), buffer(buffer) {}
~IGBPRequestBufferResponseParcel() override = default; ~IGBPRequestBufferResponseParcel() override = default;
protected: protected:
@ -308,12 +309,12 @@ protected:
class IGBPQueueBufferRequestParcel : public Parcel { class IGBPQueueBufferRequestParcel : public Parcel {
public: public:
IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) { explicit IGBPQueueBufferRequestParcel(const std::vector<u8>& buffer) : Parcel(buffer) {
Deserialize(); Deserialize();
} }
~IGBPQueueBufferRequestParcel() override = default; ~IGBPQueueBufferRequestParcel() override = default;
void DeserializeData() { void DeserializeData() override {
std::u16string token = ReadInterfaceToken(); std::u16string token = ReadInterfaceToken();
data = Read<Data>(); data = Read<Data>();
} }
@ -331,7 +332,7 @@ public:
class IGBPQueueBufferResponseParcel : public Parcel { class IGBPQueueBufferResponseParcel : public Parcel {
public: public:
IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() { explicit IGBPQueueBufferResponseParcel(u32 width, u32 height) : Parcel() {
data.width = width; data.width = width;
data.height = height; data.height = height;
} }
@ -357,7 +358,7 @@ private:
class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> { class IHOSBinderDriver final : public ServiceFramework<IHOSBinderDriver> {
public: public:
IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger) explicit IHOSBinderDriver(std::shared_ptr<NVFlinger> nv_flinger)
: ServiceFramework("IHOSBinderDriver"), nv_flinger(std::move(nv_flinger)) { : ServiceFramework("IHOSBinderDriver"), nv_flinger(std::move(nv_flinger)) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &IHOSBinderDriver::TransactParcel, "TransactParcel"}, {0, &IHOSBinderDriver::TransactParcel, "TransactParcel"},
@ -507,7 +508,7 @@ private:
class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> { class IManagerDisplayService final : public ServiceFramework<IManagerDisplayService> {
public: public:
IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger) explicit IManagerDisplayService(std::shared_ptr<NVFlinger> nv_flinger)
: ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) { : ServiceFramework("IManagerDisplayService"), nv_flinger(std::move(nv_flinger)) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"}, {1020, &IManagerDisplayService::CloseDisplay, "CloseDisplay"},