From ae633292c06e70f419891852bfe374644d287bd7 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 18 Dec 2020 11:27:08 +0300 Subject: [PATCH] Replace int32_t with s32 --- .../Emu/NP/generated/np2_structs_generated.h | 26 +++++++++---------- rpcs3/Emu/RSX/VK/VKHelpers.cpp | 4 +-- rpcs3/Emu/RSX/VK/VKHelpers.h | 4 +-- rpcs3/Emu/RSX/VK/VKRenderPass.cpp | 4 +-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/rpcs3/Emu/NP/generated/np2_structs_generated.h b/rpcs3/Emu/NP/generated/np2_structs_generated.h index f8b612e765..7b24976f0c 100644 --- a/rpcs3/Emu/NP/generated/np2_structs_generated.h +++ b/rpcs3/Emu/NP/generated/np2_structs_generated.h @@ -1425,8 +1425,8 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_BINFILTER = 20, VT_ATTRID = 22 }; - int32_t option() const { - return GetField(VT_OPTION, 0); + s32 option() const { + return GetField(VT_OPTION, 0); } uint32_t worldId() const { return GetField(VT_WORLDID, 0); @@ -1457,7 +1457,7 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_OPTION) && + VerifyField(verifier, VT_OPTION) && VerifyField(verifier, VT_WORLDID) && VerifyField(verifier, VT_LOBBYID) && VerifyField(verifier, VT_RANGEFILTER_STARTINDEX) && @@ -1479,8 +1479,8 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct SearchRoomRequestBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_option(int32_t option) { - fbb_.AddElement(SearchRoomRequest::VT_OPTION, option, 0); + void add_option(s32 option) { + fbb_.AddElement(SearchRoomRequest::VT_OPTION, option, 0); } void add_worldId(uint32_t worldId) { fbb_.AddElement(SearchRoomRequest::VT_WORLDID, worldId, 0); @@ -1523,7 +1523,7 @@ struct SearchRoomRequestBuilder { inline flatbuffers::Offset CreateSearchRoomRequest( flatbuffers::FlatBufferBuilder &_fbb, - int32_t option = 0, + s32 option = 0, uint32_t worldId = 0, uint64_t lobbyId = 0, uint32_t rangeFilter_startIndex = 0, @@ -1549,7 +1549,7 @@ inline flatbuffers::Offset CreateSearchRoomRequest( inline flatbuffers::Offset CreateSearchRoomRequestDirect( flatbuffers::FlatBufferBuilder &_fbb, - int32_t option = 0, + s32 option = 0, uint32_t worldId = 0, uint64_t lobbyId = 0, uint32_t rangeFilter_startIndex = 0, @@ -2453,8 +2453,8 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { u8 eventCause() const { return GetField(VT_EVENTCAUSE, 0); } - int32_t errorCode() const { - return GetField(VT_ERRORCODE, 0); + s32 errorCode() const { + return GetField(VT_ERRORCODE, 0); } const PresenceOptionData *optData() const { return GetPointer(VT_OPTDATA); @@ -2462,7 +2462,7 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_EVENTCAUSE) && - VerifyField(verifier, VT_ERRORCODE) && + VerifyField(verifier, VT_ERRORCODE) && VerifyOffset(verifier, VT_OPTDATA) && verifier.VerifyTable(optData()) && verifier.EndTable(); @@ -2475,8 +2475,8 @@ struct RoomUpdateInfoBuilder { void add_eventCause(u8 eventCause) { fbb_.AddElement(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0); } - void add_errorCode(int32_t errorCode) { - fbb_.AddElement(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0); + void add_errorCode(s32 errorCode) { + fbb_.AddElement(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0); } void add_optData(flatbuffers::Offset optData) { fbb_.AddOffset(RoomUpdateInfo::VT_OPTDATA, optData); @@ -2496,7 +2496,7 @@ struct RoomUpdateInfoBuilder { inline flatbuffers::Offset CreateRoomUpdateInfo( flatbuffers::FlatBufferBuilder &_fbb, u8 eventCause = 0, - int32_t errorCode = 0, + s32 errorCode = 0, flatbuffers::Offset optData = 0) { RoomUpdateInfoBuilder builder_(_fbb); builder_.add_optData(optData); diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index e84d4d66d0..c7431b8abc 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -1124,7 +1124,7 @@ namespace vk } VKAPI_ATTR VkBool32 VKAPI_CALL dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, - uint64_t srcObject, usz location, int32_t msgCode, + uint64_t srcObject, usz location, s32 msgCode, const char *pLayerPrefix, const char *pMsg, void *pUserData) { if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) @@ -1147,7 +1147,7 @@ namespace vk } VkBool32 BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, - uint64_t srcObject, usz location, int32_t msgCode, + uint64_t srcObject, usz location, s32 msgCode, const char *pLayerPrefix, const char *pMsg, void *pUserData) { #ifdef _WIN32 diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index a564805827..a84f0f5a71 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -53,11 +53,11 @@ namespace vk VKAPI_ATTR void VKAPI_CALL mem_free(void *pUserData, void *pMemory); VKAPI_ATTR VkBool32 VKAPI_CALL dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, - uint64_t srcObject, usz location, int32_t msgCode, + uint64_t srcObject, usz location, s32 msgCode, const char *pLayerPrefix, const char *pMsg, void *pUserData); VkBool32 BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, - uint64_t srcObject, usz location, int32_t msgCode, + uint64_t srcObject, usz location, s32 msgCode, const char *pLayerPrefix, const char *pMsg, void *pUserData); diff --git a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp b/rpcs3/Emu/RSX/VK/VKRenderPass.cpp index f709b5b910..fd6987470c 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp +++ b/rpcs3/Emu/RSX/VK/VKRenderPass.cpp @@ -242,8 +242,8 @@ namespace vk rp_begin.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; rp_begin.renderPass = pass; rp_begin.framebuffer = target; - rp_begin.renderArea.offset.x = static_cast(framebuffer_region.x); - rp_begin.renderArea.offset.y = static_cast(framebuffer_region.y); + rp_begin.renderArea.offset.x = static_cast(framebuffer_region.x); + rp_begin.renderArea.offset.y = static_cast(framebuffer_region.y); rp_begin.renderArea.extent.width = framebuffer_region.width; rp_begin.renderArea.extent.height = framebuffer_region.height;