ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace int32_t with s32

This commit is contained in:
Nekotekina 2020-12-18 11:27:08 +03:00
parent d6042cf891
commit ae633292c0
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rpcs3/Emu/NP/generated/np2_structs_generated.h
View File

@ -1425,8 +1425,8 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VT_BINFILTER = 20, VT_BINFILTER = 20,
VT_ATTRID = 22 VT_ATTRID = 22
}; };
int32_t option() const { s32 option() const {
return GetField<int32_t>(VT_OPTION, 0); return GetField<s32>(VT_OPTION, 0);
} }
uint32_t worldId() const { uint32_t worldId() const {
return GetField<uint32_t>(VT_WORLDID, 0); return GetField<uint32_t>(VT_WORLDID, 0);
@ -1457,7 +1457,7 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
} }
bool Verify(flatbuffers::Verifier &verifier) const { bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) && return VerifyTableStart(verifier) &&
VerifyField<int32_t>(verifier, VT_OPTION) && VerifyField<s32>(verifier, VT_OPTION) &&
VerifyField<uint32_t>(verifier, VT_WORLDID) && VerifyField<uint32_t>(verifier, VT_WORLDID) &&
VerifyField<uint64_t>(verifier, VT_LOBBYID) && VerifyField<uint64_t>(verifier, VT_LOBBYID) &&
VerifyField<uint32_t>(verifier, VT_RANGEFILTER_STARTINDEX) && VerifyField<uint32_t>(verifier, VT_RANGEFILTER_STARTINDEX) &&
@ -1479,8 +1479,8 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
struct SearchRoomRequestBuilder { struct SearchRoomRequestBuilder {
flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_; flatbuffers::uoffset_t start_;
void add_option(int32_t option) { void add_option(s32 option) {
fbb_.AddElement<int32_t>(SearchRoomRequest::VT_OPTION, option, 0); fbb_.AddElement<s32>(SearchRoomRequest::VT_OPTION, option, 0);
} }
void add_worldId(uint32_t worldId) { void add_worldId(uint32_t worldId) {
fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_WORLDID, worldId, 0); fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_WORLDID, worldId, 0);
@ -1523,7 +1523,7 @@ struct SearchRoomRequestBuilder {
inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest( inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
int32_t option = 0, s32 option = 0,
uint32_t worldId = 0, uint32_t worldId = 0,
uint64_t lobbyId = 0, uint64_t lobbyId = 0,
uint32_t rangeFilter_startIndex = 0, uint32_t rangeFilter_startIndex = 0,
@ -1549,7 +1549,7 @@ inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest(
inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequestDirect( inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequestDirect(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
int32_t option = 0, s32 option = 0,
uint32_t worldId = 0, uint32_t worldId = 0,
uint64_t lobbyId = 0, uint64_t lobbyId = 0,
uint32_t rangeFilter_startIndex = 0, uint32_t rangeFilter_startIndex = 0,
@ -2453,8 +2453,8 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
u8 eventCause() const { u8 eventCause() const {
return GetField<u8>(VT_EVENTCAUSE, 0); return GetField<u8>(VT_EVENTCAUSE, 0);
} }
int32_t errorCode() const { s32 errorCode() const {
return GetField<int32_t>(VT_ERRORCODE, 0); return GetField<s32>(VT_ERRORCODE, 0);
} }
const PresenceOptionData *optData() const { const PresenceOptionData *optData() const {
return GetPointer<const PresenceOptionData *>(VT_OPTDATA); return GetPointer<const PresenceOptionData *>(VT_OPTDATA);
@ -2462,7 +2462,7 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool Verify(flatbuffers::Verifier &verifier) const { bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) && return VerifyTableStart(verifier) &&
VerifyField<u8>(verifier, VT_EVENTCAUSE) && VerifyField<u8>(verifier, VT_EVENTCAUSE) &&
VerifyField<int32_t>(verifier, VT_ERRORCODE) && VerifyField<s32>(verifier, VT_ERRORCODE) &&
VerifyOffset(verifier, VT_OPTDATA) && VerifyOffset(verifier, VT_OPTDATA) &&
verifier.VerifyTable(optData()) && verifier.VerifyTable(optData()) &&
verifier.EndTable(); verifier.EndTable();
@ -2475,8 +2475,8 @@ struct RoomUpdateInfoBuilder {
void add_eventCause(u8 eventCause) { void add_eventCause(u8 eventCause) {
fbb_.AddElement<u8>(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0); fbb_.AddElement<u8>(RoomUpdateInfo::VT_EVENTCAUSE, eventCause, 0);
} }
void add_errorCode(int32_t errorCode) { void add_errorCode(s32 errorCode) {
fbb_.AddElement<int32_t>(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0); fbb_.AddElement<s32>(RoomUpdateInfo::VT_ERRORCODE, errorCode, 0);
} }
void add_optData(flatbuffers::Offset<PresenceOptionData> optData) { void add_optData(flatbuffers::Offset<PresenceOptionData> optData) {
fbb_.AddOffset(RoomUpdateInfo::VT_OPTDATA, optData); fbb_.AddOffset(RoomUpdateInfo::VT_OPTDATA, optData);
@ -2496,7 +2496,7 @@ struct RoomUpdateInfoBuilder {
inline flatbuffers::Offset<RoomUpdateInfo> CreateRoomUpdateInfo( inline flatbuffers::Offset<RoomUpdateInfo> CreateRoomUpdateInfo(
flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::FlatBufferBuilder &_fbb,
u8 eventCause = 0, u8 eventCause = 0,
int32_t errorCode = 0, s32 errorCode = 0,
flatbuffers::Offset<PresenceOptionData> optData = 0) { flatbuffers::Offset<PresenceOptionData> optData = 0) {
RoomUpdateInfoBuilder builder_(_fbb); RoomUpdateInfoBuilder builder_(_fbb);
builder_.add_optData(optData); builder_.add_optData(optData);

4
rpcs3/Emu/RSX/VK/VKHelpers.cpp
View File

@ -1124,7 +1124,7 @@ namespace vk
} }
VKAPI_ATTR VkBool32 VKAPI_CALL dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, 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) const char *pLayerPrefix, const char *pMsg, void *pUserData)
{ {
if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT)
@ -1147,7 +1147,7 @@ namespace vk
} }
VkBool32 BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, 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) const char *pLayerPrefix, const char *pMsg, void *pUserData)
{ {
#ifdef _WIN32 #ifdef _WIN32

4
rpcs3/Emu/RSX/VK/VKHelpers.h
View File

@ -53,11 +53,11 @@ namespace vk
VKAPI_ATTR void VKAPI_CALL mem_free(void *pUserData, void *pMemory); VKAPI_ATTR void VKAPI_CALL mem_free(void *pUserData, void *pMemory);
VKAPI_ATTR VkBool32 VKAPI_CALL dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, 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); const char *pLayerPrefix, const char *pMsg, void *pUserData);
VkBool32 BreakCallback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, 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, const char *pLayerPrefix, const char *pMsg,
void *pUserData); void *pUserData);

4
rpcs3/Emu/RSX/VK/VKRenderPass.cpp
View File

@ -242,8 +242,8 @@ namespace vk
rp_begin.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; rp_begin.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
rp_begin.renderPass = pass; rp_begin.renderPass = pass;
rp_begin.framebuffer = target; rp_begin.framebuffer = target;
rp_begin.renderArea.offset.x = static_cast<int32_t>(framebuffer_region.x); rp_begin.renderArea.offset.x = static_cast<s32>(framebuffer_region.x);
rp_begin.renderArea.offset.y = static_cast<int32_t>(framebuffer_region.y); rp_begin.renderArea.offset.y = static_cast<s32>(framebuffer_region.y);
rp_begin.renderArea.extent.width = framebuffer_region.width; rp_begin.renderArea.extent.width = framebuffer_region.width;
rp_begin.renderArea.extent.height = framebuffer_region.height; rp_begin.renderArea.extent.height = framebuffer_region.height;