From 77352a2a8697e74aee7b10ac7c8afc603cf7c1d6 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Fri, 18 Dec 2020 11:34:50 +0300 Subject: [PATCH] Replace uint32_t with u32 --- rpcs3/Emu/Cell/Modules/cellMic.h | 2 +- rpcs3/Emu/Cell/Modules/cellRtc.cpp | 2 +- .../Emu/NP/generated/np2_structs_generated.h | 358 +++++++++--------- rpcs3/Emu/RSX/Overlays/overlay_controls.h | 2 +- rpcs3/Emu/RSX/VK/VKCompute.h | 2 +- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 4 +- rpcs3/Emu/RSX/VK/VKHelpers.cpp | 2 +- rpcs3/Emu/RSX/VK/VKHelpers.h | 100 ++--- rpcs3/Emu/RSX/VK/VKOverlays.h | 2 +- rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp | 6 +- rpcs3/Emu/RSX/VK/VKRenderPass.cpp | 2 +- rpcs3/Emu/RSX/VK/VKRenderTargets.h | 4 +- rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp | 10 +- rpcs3/Emu/RSX/VK/VKShaderInterpreter.h | 10 +- rpcs3/Emu/RSX/VK/VKTexture.cpp | 2 +- rpcs3/Emu/RSX/gcm_printing.cpp | 2 +- rpcs3/Emu/RSX/rsx_decode.h | 2 +- rpcs3/Emu/RSX/rsx_utils.h | 2 +- rpcs3/rpcs3qt/localized.h | 8 +- 19 files changed, 262 insertions(+), 260 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h index 1c7fc60588..10adb2df1d 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.h +++ b/rpcs3/Emu/Cell/Modules/cellMic.h @@ -158,7 +158,7 @@ struct CellMicInputStream struct CellMicInputDefinition { // TODO: Data types - volatile uint32_t uiDevId; + volatile u32 uiDevId; CellMicInputStream data; CellMicInputFormatI aux_format; CellMicInputFormatI raw_format; diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.cpp b/rpcs3/Emu/Cell/Modules/cellRtc.cpp index 9fd9dc3b19..0e83d4bce3 100644 --- a/rpcs3/Emu/Cell/Modules/cellRtc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRtc.cpp @@ -823,7 +823,7 @@ error_code cellRtcSetTick(vm::ptr pTime, vm::cptr do { bool leap = is_leap_year(years); - for (uint32_t m = 0; m <= 11; m++) + for (u32 m = 0; m <= 11; m++) { u8 daysinmonth = DAYS_IN_MONTH[m + (leap * 12)]; if (days_tmp >= daysinmonth) diff --git a/rpcs3/Emu/NP/generated/np2_structs_generated.h b/rpcs3/Emu/NP/generated/np2_structs_generated.h index 7b24976f0c..3e54f9f351 100644 --- a/rpcs3/Emu/NP/generated/np2_structs_generated.h +++ b/rpcs3/Emu/NP/generated/np2_structs_generated.h @@ -132,13 +132,13 @@ struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { u16 id() const { return GetField(VT_ID, 0); } - uint32_t num() const { - return GetField(VT_NUM, 0); + u32 num() const { + return GetField(VT_NUM, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ID) && - VerifyField(verifier, VT_NUM) && + VerifyField(verifier, VT_NUM) && verifier.EndTable(); } }; @@ -149,8 +149,8 @@ struct IntAttrBuilder { void add_id(u16 id) { fbb_.AddElement(IntAttr::VT_ID, id, 0); } - void add_num(uint32_t num) { - fbb_.AddElement(IntAttr::VT_NUM, num, 0); + void add_num(u32 num) { + fbb_.AddElement(IntAttr::VT_NUM, num, 0); } explicit IntAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -167,7 +167,7 @@ struct IntAttrBuilder { inline flatbuffers::Offset CreateIntAttr( flatbuffers::FlatBufferBuilder &_fbb, u16 id = 0, - uint32_t num = 0) { + u32 num = 0) { IntAttrBuilder builder_(_fbb); builder_.add_num(num); builder_.add_id(id); @@ -353,8 +353,8 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_LABEL = 8, VT_WITHPASSWORD = 10 }; - uint32_t slotNum() const { - return GetField(VT_SLOTNUM, 0); + u32 slotNum() const { + return GetField(VT_SLOTNUM, 0); } bool withLabel() const { return GetField(VT_WITHLABEL, 0) != 0; @@ -367,7 +367,7 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_SLOTNUM) && + VerifyField(verifier, VT_SLOTNUM) && VerifyField(verifier, VT_WITHLABEL) && VerifyOffset(verifier, VT_LABEL) && verifier.VerifyVector(label()) && @@ -379,8 +379,8 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct GroupConfigBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_slotNum(uint32_t slotNum) { - fbb_.AddElement(GroupConfig::VT_SLOTNUM, slotNum, 0); + void add_slotNum(u32 slotNum) { + fbb_.AddElement(GroupConfig::VT_SLOTNUM, slotNum, 0); } void add_withLabel(bool withLabel) { fbb_.AddElement(GroupConfig::VT_WITHLABEL, static_cast(withLabel), 0); @@ -405,7 +405,7 @@ struct GroupConfigBuilder { inline flatbuffers::Offset CreateGroupConfig( flatbuffers::FlatBufferBuilder &_fbb, - uint32_t slotNum = 0, + u32 slotNum = 0, bool withLabel = false, flatbuffers::Offset> label = 0, bool withPassword = false) { @@ -419,7 +419,7 @@ inline flatbuffers::Offset CreateGroupConfig( inline flatbuffers::Offset CreateGroupConfigDirect( flatbuffers::FlatBufferBuilder &_fbb, - uint32_t slotNum = 0, + u32 slotNum = 0, bool withLabel = false, const std::vector *label = nullptr, bool withPassword = false) { @@ -539,8 +539,8 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab u8 natType() const { return GetField(VT_NATTYPE, 0); } - uint32_t flagAttr() const { - return GetField(VT_FLAGATTR, 0); + u32 flagAttr() const { + return GetField(VT_FLAGATTR, 0); } const flatbuffers::Vector> *roomMemberBinAttrInternal() const { return GetPointer> *>(VT_ROOMMEMBERBINATTRINTERNAL); @@ -554,7 +554,7 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab VerifyField(verifier, VT_TEAMID) && VerifyField(verifier, VT_ROOMGROUP) && VerifyField(verifier, VT_NATTYPE) && - VerifyField(verifier, VT_FLAGATTR) && + VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && verifier.VerifyVector(roomMemberBinAttrInternal()) && verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && @@ -583,8 +583,8 @@ struct RoomMemberDataInternalBuilder { void add_natType(u8 natType) { fbb_.AddElement(RoomMemberDataInternal::VT_NATTYPE, natType, 0); } - void add_flagAttr(uint32_t flagAttr) { - fbb_.AddElement(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0); + void add_flagAttr(u32 flagAttr) { + fbb_.AddElement(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0); } void add_roomMemberBinAttrInternal(flatbuffers::Offset>> roomMemberBinAttrInternal) { fbb_.AddOffset(RoomMemberDataInternal::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal); @@ -609,7 +609,7 @@ inline flatbuffers::Offset CreateRoomMemberDataInternal( u8 teamId = 0, u8 roomGroup = 0, u8 natType = 0, - uint32_t flagAttr = 0, + u32 flagAttr = 0, flatbuffers::Offset>> roomMemberBinAttrInternal = 0) { RoomMemberDataInternalBuilder builder_(_fbb); builder_.add_joinDate(joinDate); @@ -631,7 +631,7 @@ inline flatbuffers::Offset CreateRoomMemberDataInternalD u8 teamId = 0, u8 roomGroup = 0, u8 natType = 0, - uint32_t flagAttr = 0, + u32 flagAttr = 0, const std::vector> *roomMemberBinAttrInternal = nullptr) { auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector>(*roomMemberBinAttrInternal) : 0; return CreateRoomMemberDataInternal( @@ -667,11 +667,11 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const flatbuffers::Vector *label() const { return GetPointer *>(VT_LABEL); } - uint32_t slotNum() const { - return GetField(VT_SLOTNUM, 0); + u32 slotNum() const { + return GetField(VT_SLOTNUM, 0); } - uint32_t curGroupMemberNum() const { - return GetField(VT_CURGROUPMEMBERNUM, 0); + u32 curGroupMemberNum() const { + return GetField(VT_CURGROUPMEMBERNUM, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && @@ -680,8 +680,8 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VerifyField(verifier, VT_WITHLABEL) && VerifyOffset(verifier, VT_LABEL) && verifier.VerifyVector(label()) && - VerifyField(verifier, VT_SLOTNUM) && - VerifyField(verifier, VT_CURGROUPMEMBERNUM) && + VerifyField(verifier, VT_SLOTNUM) && + VerifyField(verifier, VT_CURGROUPMEMBERNUM) && verifier.EndTable(); } }; @@ -701,11 +701,11 @@ struct RoomGroupBuilder { void add_label(flatbuffers::Offset> label) { fbb_.AddOffset(RoomGroup::VT_LABEL, label); } - void add_slotNum(uint32_t slotNum) { - fbb_.AddElement(RoomGroup::VT_SLOTNUM, slotNum, 0); + void add_slotNum(u32 slotNum) { + fbb_.AddElement(RoomGroup::VT_SLOTNUM, slotNum, 0); } - void add_curGroupMemberNum(uint32_t curGroupMemberNum) { - fbb_.AddElement(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0); + void add_curGroupMemberNum(u32 curGroupMemberNum) { + fbb_.AddElement(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0); } explicit RoomGroupBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -725,8 +725,8 @@ inline flatbuffers::Offset CreateRoomGroup( bool withPassword = false, bool withLabel = false, flatbuffers::Offset> label = 0, - uint32_t slotNum = 0, - uint32_t curGroupMemberNum = 0) { + u32 slotNum = 0, + u32 curGroupMemberNum = 0) { RoomGroupBuilder builder_(_fbb); builder_.add_curGroupMemberNum(curGroupMemberNum); builder_.add_slotNum(slotNum); @@ -743,8 +743,8 @@ inline flatbuffers::Offset CreateRoomGroupDirect( bool withPassword = false, bool withLabel = false, const std::vector *label = nullptr, - uint32_t slotNum = 0, - uint32_t curGroupMemberNum = 0) { + u32 slotNum = 0, + u32 curGroupMemberNum = 0) { auto label__ = label ? _fbb.CreateVector(*label) : 0; return CreateRoomGroup( _fbb, @@ -773,8 +773,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { u16 serverId() const { return GetField(VT_SERVERID, 0); } - uint32_t worldId() const { - return GetField(VT_WORLDID, 0); + u32 worldId() const { + return GetField(VT_WORLDID, 0); } uint64_t lobbyId() const { return GetField(VT_LOBBYID, 0); @@ -785,8 +785,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { uint64_t passwordSlotMask() const { return GetField(VT_PASSWORDSLOTMASK, 0); } - uint32_t maxSlot() const { - return GetField(VT_MAXSLOT, 0); + u32 maxSlot() const { + return GetField(VT_MAXSLOT, 0); } const flatbuffers::Vector> *memberList() const { return GetPointer> *>(VT_MEMBERLIST); @@ -797,8 +797,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const flatbuffers::Vector> *roomGroup() const { return GetPointer> *>(VT_ROOMGROUP); } - uint32_t flagAttr() const { - return GetField(VT_FLAGATTR, 0); + u32 flagAttr() const { + return GetField(VT_FLAGATTR, 0); } const flatbuffers::Vector> *roomBinAttrInternal() const { return GetPointer> *>(VT_ROOMBINATTRINTERNAL); @@ -806,11 +806,11 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SERVERID) && - VerifyField(verifier, VT_WORLDID) && + VerifyField(verifier, VT_WORLDID) && VerifyField(verifier, VT_LOBBYID) && VerifyField(verifier, VT_ROOMID) && VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyField(verifier, VT_MAXSLOT) && + VerifyField(verifier, VT_MAXSLOT) && VerifyOffset(verifier, VT_MEMBERLIST) && verifier.VerifyVector(memberList()) && verifier.VerifyVectorOfTables(memberList()) && @@ -818,7 +818,7 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VerifyOffset(verifier, VT_ROOMGROUP) && verifier.VerifyVector(roomGroup()) && verifier.VerifyVectorOfTables(roomGroup()) && - VerifyField(verifier, VT_FLAGATTR) && + VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && verifier.VerifyVector(roomBinAttrInternal()) && verifier.VerifyVectorOfTables(roomBinAttrInternal()) && @@ -832,8 +832,8 @@ struct RoomDataInternalBuilder { void add_serverId(u16 serverId) { fbb_.AddElement(RoomDataInternal::VT_SERVERID, serverId, 0); } - void add_worldId(uint32_t worldId) { - fbb_.AddElement(RoomDataInternal::VT_WORLDID, worldId, 0); + void add_worldId(u32 worldId) { + fbb_.AddElement(RoomDataInternal::VT_WORLDID, worldId, 0); } void add_lobbyId(uint64_t lobbyId) { fbb_.AddElement(RoomDataInternal::VT_LOBBYID, lobbyId, 0); @@ -844,8 +844,8 @@ struct RoomDataInternalBuilder { void add_passwordSlotMask(uint64_t passwordSlotMask) { fbb_.AddElement(RoomDataInternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0); } - void add_maxSlot(uint32_t maxSlot) { - fbb_.AddElement(RoomDataInternal::VT_MAXSLOT, maxSlot, 0); + void add_maxSlot(u32 maxSlot) { + fbb_.AddElement(RoomDataInternal::VT_MAXSLOT, maxSlot, 0); } void add_memberList(flatbuffers::Offset>> memberList) { fbb_.AddOffset(RoomDataInternal::VT_MEMBERLIST, memberList); @@ -856,8 +856,8 @@ struct RoomDataInternalBuilder { void add_roomGroup(flatbuffers::Offset>> roomGroup) { fbb_.AddOffset(RoomDataInternal::VT_ROOMGROUP, roomGroup); } - void add_flagAttr(uint32_t flagAttr) { - fbb_.AddElement(RoomDataInternal::VT_FLAGATTR, flagAttr, 0); + void add_flagAttr(u32 flagAttr) { + fbb_.AddElement(RoomDataInternal::VT_FLAGATTR, flagAttr, 0); } void add_roomBinAttrInternal(flatbuffers::Offset>> roomBinAttrInternal) { fbb_.AddOffset(RoomDataInternal::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal); @@ -877,15 +877,15 @@ struct RoomDataInternalBuilder { inline flatbuffers::Offset CreateRoomDataInternal( flatbuffers::FlatBufferBuilder &_fbb, u16 serverId = 0, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t lobbyId = 0, uint64_t roomId = 0, uint64_t passwordSlotMask = 0, - uint32_t maxSlot = 0, + u32 maxSlot = 0, flatbuffers::Offset>> memberList = 0, u16 ownerId = 0, flatbuffers::Offset>> roomGroup = 0, - uint32_t flagAttr = 0, + u32 flagAttr = 0, flatbuffers::Offset>> roomBinAttrInternal = 0) { RoomDataInternalBuilder builder_(_fbb); builder_.add_passwordSlotMask(passwordSlotMask); @@ -905,15 +905,15 @@ inline flatbuffers::Offset CreateRoomDataInternal( inline flatbuffers::Offset CreateRoomDataInternalDirect( flatbuffers::FlatBufferBuilder &_fbb, u16 serverId = 0, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t lobbyId = 0, uint64_t roomId = 0, uint64_t passwordSlotMask = 0, - uint32_t maxSlot = 0, + u32 maxSlot = 0, const std::vector> *memberList = nullptr, u16 ownerId = 0, const std::vector> *roomGroup = nullptr, - uint32_t flagAttr = 0, + u32 flagAttr = 0, const std::vector> *roomBinAttrInternal = nullptr) { auto memberList__ = memberList ? _fbb.CreateVector>(*memberList) : 0; auto roomGroup__ = roomGroup ? _fbb.CreateVector>(*roomGroup) : 0; @@ -956,8 +956,8 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { u16 serverId() const { return GetField(VT_SERVERID, 0); } - uint32_t worldId() const { - return GetField(VT_WORLDID, 0); + u32 worldId() const { + return GetField(VT_WORLDID, 0); } u16 publicSlotNum() const { return GetField(VT_PUBLICSLOTNUM, 0); @@ -992,8 +992,8 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const flatbuffers::Vector> *roomGroup() const { return GetPointer> *>(VT_ROOMGROUP); } - uint32_t flagAttr() const { - return GetField(VT_FLAGATTR, 0); + u32 flagAttr() const { + return GetField(VT_FLAGATTR, 0); } const flatbuffers::Vector> *roomSearchableIntAttrExternal() const { return GetPointer> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL); @@ -1007,7 +1007,7 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SERVERID) && - VerifyField(verifier, VT_WORLDID) && + VerifyField(verifier, VT_WORLDID) && VerifyField(verifier, VT_PUBLICSLOTNUM) && VerifyField(verifier, VT_PRIVATESLOTNUM) && VerifyField(verifier, VT_LOBBYID) && @@ -1022,7 +1022,7 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VerifyOffset(verifier, VT_ROOMGROUP) && verifier.VerifyVector(roomGroup()) && verifier.VerifyVectorOfTables(roomGroup()) && - VerifyField(verifier, VT_FLAGATTR) && + VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) && verifier.VerifyVector(roomSearchableIntAttrExternal()) && verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) && @@ -1042,8 +1042,8 @@ struct RoomDataExternalBuilder { void add_serverId(u16 serverId) { fbb_.AddElement(RoomDataExternal::VT_SERVERID, serverId, 0); } - void add_worldId(uint32_t worldId) { - fbb_.AddElement(RoomDataExternal::VT_WORLDID, worldId, 0); + void add_worldId(u32 worldId) { + fbb_.AddElement(RoomDataExternal::VT_WORLDID, worldId, 0); } void add_publicSlotNum(u16 publicSlotNum) { fbb_.AddElement(RoomDataExternal::VT_PUBLICSLOTNUM, publicSlotNum, 0); @@ -1078,8 +1078,8 @@ struct RoomDataExternalBuilder { void add_roomGroup(flatbuffers::Offset>> roomGroup) { fbb_.AddOffset(RoomDataExternal::VT_ROOMGROUP, roomGroup); } - void add_flagAttr(uint32_t flagAttr) { - fbb_.AddElement(RoomDataExternal::VT_FLAGATTR, flagAttr, 0); + void add_flagAttr(u32 flagAttr) { + fbb_.AddElement(RoomDataExternal::VT_FLAGATTR, flagAttr, 0); } void add_roomSearchableIntAttrExternal(flatbuffers::Offset>> roomSearchableIntAttrExternal) { fbb_.AddOffset(RoomDataExternal::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal); @@ -1105,7 +1105,7 @@ struct RoomDataExternalBuilder { inline flatbuffers::Offset CreateRoomDataExternal( flatbuffers::FlatBufferBuilder &_fbb, u16 serverId = 0, - uint32_t worldId = 0, + u32 worldId = 0, u16 publicSlotNum = 0, u16 privateSlotNum = 0, uint64_t lobbyId = 0, @@ -1117,7 +1117,7 @@ inline flatbuffers::Offset CreateRoomDataExternal( uint64_t passwordSlotMask = 0, flatbuffers::Offset owner = 0, flatbuffers::Offset>> roomGroup = 0, - uint32_t flagAttr = 0, + u32 flagAttr = 0, flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, flatbuffers::Offset>> roomBinAttrExternal = 0) { @@ -1145,7 +1145,7 @@ inline flatbuffers::Offset CreateRoomDataExternal( inline flatbuffers::Offset CreateRoomDataExternalDirect( flatbuffers::FlatBufferBuilder &_fbb, u16 serverId = 0, - uint32_t worldId = 0, + u32 worldId = 0, u16 publicSlotNum = 0, u16 privateSlotNum = 0, uint64_t lobbyId = 0, @@ -1157,7 +1157,7 @@ inline flatbuffers::Offset CreateRoomDataExternalDirect( uint64_t passwordSlotMask = 0, flatbuffers::Offset owner = 0, const std::vector> *roomGroup = nullptr, - uint32_t flagAttr = 0, + u32 flagAttr = 0, const std::vector> *roomSearchableIntAttrExternal = nullptr, const std::vector> *roomSearchableBinAttrExternal = nullptr, const std::vector> *roomBinAttrExternal = nullptr) { @@ -1296,14 +1296,14 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const flatbuffers::Vector *data() const { return GetPointer *>(VT_DATA); } - uint32_t len() const { - return GetField(VT_LEN, 0); + u32 len() const { + return GetField(VT_LEN, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_DATA) && verifier.VerifyVector(data()) && - VerifyField(verifier, VT_LEN) && + VerifyField(verifier, VT_LEN) && verifier.EndTable(); } }; @@ -1314,8 +1314,8 @@ struct PresenceOptionDataBuilder { void add_data(flatbuffers::Offset> data) { fbb_.AddOffset(PresenceOptionData::VT_DATA, data); } - void add_len(uint32_t len) { - fbb_.AddElement(PresenceOptionData::VT_LEN, len, 0); + void add_len(u32 len) { + fbb_.AddElement(PresenceOptionData::VT_LEN, len, 0); } explicit PresenceOptionDataBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -1332,7 +1332,7 @@ struct PresenceOptionDataBuilder { inline flatbuffers::Offset CreatePresenceOptionData( flatbuffers::FlatBufferBuilder &_fbb, flatbuffers::Offset> data = 0, - uint32_t len = 0) { + u32 len = 0) { PresenceOptionDataBuilder builder_(_fbb); builder_.add_len(len); builder_.add_data(data); @@ -1342,7 +1342,7 @@ inline flatbuffers::Offset CreatePresenceOptionData( inline flatbuffers::Offset CreatePresenceOptionDataDirect( flatbuffers::FlatBufferBuilder &_fbb, const std::vector *data = nullptr, - uint32_t len = 0) { + u32 len = 0) { auto data__ = data ? _fbb.CreateVector(*data) : 0; return CreatePresenceOptionData( _fbb, @@ -1428,23 +1428,23 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { s32 option() const { return GetField(VT_OPTION, 0); } - uint32_t worldId() const { - return GetField(VT_WORLDID, 0); + u32 worldId() const { + return GetField(VT_WORLDID, 0); } uint64_t lobbyId() const { return GetField(VT_LOBBYID, 0); } - uint32_t rangeFilter_startIndex() const { - return GetField(VT_RANGEFILTER_STARTINDEX, 0); + u32 rangeFilter_startIndex() const { + return GetField(VT_RANGEFILTER_STARTINDEX, 0); } - uint32_t rangeFilter_max() const { - return GetField(VT_RANGEFILTER_MAX, 0); + u32 rangeFilter_max() const { + return GetField(VT_RANGEFILTER_MAX, 0); } - uint32_t flagFilter() const { - return GetField(VT_FLAGFILTER, 0); + u32 flagFilter() const { + return GetField(VT_FLAGFILTER, 0); } - uint32_t flagAttr() const { - return GetField(VT_FLAGATTR, 0); + u32 flagAttr() const { + return GetField(VT_FLAGATTR, 0); } const flatbuffers::Vector> *intFilter() const { return GetPointer> *>(VT_INTFILTER); @@ -1458,12 +1458,12 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_OPTION) && - VerifyField(verifier, VT_WORLDID) && + VerifyField(verifier, VT_WORLDID) && VerifyField(verifier, VT_LOBBYID) && - VerifyField(verifier, VT_RANGEFILTER_STARTINDEX) && - VerifyField(verifier, VT_RANGEFILTER_MAX) && - VerifyField(verifier, VT_FLAGFILTER) && - VerifyField(verifier, VT_FLAGATTR) && + VerifyField(verifier, VT_RANGEFILTER_STARTINDEX) && + VerifyField(verifier, VT_RANGEFILTER_MAX) && + VerifyField(verifier, VT_FLAGFILTER) && + VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_INTFILTER) && verifier.VerifyVector(intFilter()) && verifier.VerifyVectorOfTables(intFilter()) && @@ -1482,23 +1482,23 @@ struct SearchRoomRequestBuilder { 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); + void add_worldId(u32 worldId) { + fbb_.AddElement(SearchRoomRequest::VT_WORLDID, worldId, 0); } void add_lobbyId(uint64_t lobbyId) { fbb_.AddElement(SearchRoomRequest::VT_LOBBYID, lobbyId, 0); } - void add_rangeFilter_startIndex(uint32_t rangeFilter_startIndex) { - fbb_.AddElement(SearchRoomRequest::VT_RANGEFILTER_STARTINDEX, rangeFilter_startIndex, 0); + void add_rangeFilter_startIndex(u32 rangeFilter_startIndex) { + fbb_.AddElement(SearchRoomRequest::VT_RANGEFILTER_STARTINDEX, rangeFilter_startIndex, 0); } - void add_rangeFilter_max(uint32_t rangeFilter_max) { - fbb_.AddElement(SearchRoomRequest::VT_RANGEFILTER_MAX, rangeFilter_max, 0); + void add_rangeFilter_max(u32 rangeFilter_max) { + fbb_.AddElement(SearchRoomRequest::VT_RANGEFILTER_MAX, rangeFilter_max, 0); } - void add_flagFilter(uint32_t flagFilter) { - fbb_.AddElement(SearchRoomRequest::VT_FLAGFILTER, flagFilter, 0); + void add_flagFilter(u32 flagFilter) { + fbb_.AddElement(SearchRoomRequest::VT_FLAGFILTER, flagFilter, 0); } - void add_flagAttr(uint32_t flagAttr) { - fbb_.AddElement(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0); + void add_flagAttr(u32 flagAttr) { + fbb_.AddElement(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0); } void add_intFilter(flatbuffers::Offset>> intFilter) { fbb_.AddOffset(SearchRoomRequest::VT_INTFILTER, intFilter); @@ -1524,12 +1524,12 @@ struct SearchRoomRequestBuilder { inline flatbuffers::Offset CreateSearchRoomRequest( flatbuffers::FlatBufferBuilder &_fbb, s32 option = 0, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t lobbyId = 0, - uint32_t rangeFilter_startIndex = 0, - uint32_t rangeFilter_max = 0, - uint32_t flagFilter = 0, - uint32_t flagAttr = 0, + u32 rangeFilter_startIndex = 0, + u32 rangeFilter_max = 0, + u32 flagFilter = 0, + u32 flagAttr = 0, flatbuffers::Offset>> intFilter = 0, flatbuffers::Offset>> binFilter = 0, flatbuffers::Offset> attrId = 0) { @@ -1550,12 +1550,12 @@ inline flatbuffers::Offset CreateSearchRoomRequest( inline flatbuffers::Offset CreateSearchRoomRequestDirect( flatbuffers::FlatBufferBuilder &_fbb, s32 option = 0, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t lobbyId = 0, - uint32_t rangeFilter_startIndex = 0, - uint32_t rangeFilter_max = 0, - uint32_t flagFilter = 0, - uint32_t flagAttr = 0, + u32 rangeFilter_startIndex = 0, + u32 rangeFilter_max = 0, + u32 flagFilter = 0, + u32 flagAttr = 0, const std::vector> *intFilter = nullptr, const std::vector> *binFilter = nullptr, const std::vector *attrId = nullptr) { @@ -1583,23 +1583,23 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { VT_SIZE = 8, VT_ROOMS = 10 }; - uint32_t startIndex() const { - return GetField(VT_STARTINDEX, 0); + u32 startIndex() const { + return GetField(VT_STARTINDEX, 0); } - uint32_t total() const { - return GetField(VT_TOTAL, 0); + u32 total() const { + return GetField(VT_TOTAL, 0); } - uint32_t size() const { - return GetField(VT_SIZE, 0); + u32 size() const { + return GetField(VT_SIZE, 0); } const flatbuffers::Vector> *rooms() const { return GetPointer> *>(VT_ROOMS); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_STARTINDEX) && - VerifyField(verifier, VT_TOTAL) && - VerifyField(verifier, VT_SIZE) && + VerifyField(verifier, VT_STARTINDEX) && + VerifyField(verifier, VT_TOTAL) && + VerifyField(verifier, VT_SIZE) && VerifyOffset(verifier, VT_ROOMS) && verifier.VerifyVector(rooms()) && verifier.VerifyVectorOfTables(rooms()) && @@ -1610,14 +1610,14 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { struct SearchRoomResponseBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_startIndex(uint32_t startIndex) { - fbb_.AddElement(SearchRoomResponse::VT_STARTINDEX, startIndex, 0); + void add_startIndex(u32 startIndex) { + fbb_.AddElement(SearchRoomResponse::VT_STARTINDEX, startIndex, 0); } - void add_total(uint32_t total) { - fbb_.AddElement(SearchRoomResponse::VT_TOTAL, total, 0); + void add_total(u32 total) { + fbb_.AddElement(SearchRoomResponse::VT_TOTAL, total, 0); } - void add_size(uint32_t size) { - fbb_.AddElement(SearchRoomResponse::VT_SIZE, size, 0); + void add_size(u32 size) { + fbb_.AddElement(SearchRoomResponse::VT_SIZE, size, 0); } void add_rooms(flatbuffers::Offset>> rooms) { fbb_.AddOffset(SearchRoomResponse::VT_ROOMS, rooms); @@ -1636,9 +1636,9 @@ struct SearchRoomResponseBuilder { inline flatbuffers::Offset CreateSearchRoomResponse( flatbuffers::FlatBufferBuilder &_fbb, - uint32_t startIndex = 0, - uint32_t total = 0, - uint32_t size = 0, + u32 startIndex = 0, + u32 total = 0, + u32 size = 0, flatbuffers::Offset>> rooms = 0) { SearchRoomResponseBuilder builder_(_fbb); builder_.add_rooms(rooms); @@ -1650,9 +1650,9 @@ inline flatbuffers::Offset CreateSearchRoomResponse( inline flatbuffers::Offset CreateSearchRoomResponseDirect( flatbuffers::FlatBufferBuilder &_fbb, - uint32_t startIndex = 0, - uint32_t total = 0, - uint32_t size = 0, + u32 startIndex = 0, + u32 total = 0, + u32 size = 0, const std::vector> *rooms = nullptr) { auto rooms__ = rooms ? _fbb.CreateVector>(*rooms) : 0; return CreateSearchRoomResponse( @@ -1683,17 +1683,17 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl VT_TEAMID = 34, VT_SIGOPTPARAM = 36 }; - uint32_t worldId() const { - return GetField(VT_WORLDID, 0); + u32 worldId() const { + return GetField(VT_WORLDID, 0); } uint64_t lobbyId() const { return GetField(VT_LOBBYID, 0); } - uint32_t maxSlot() const { - return GetField(VT_MAXSLOT, 0); + u32 maxSlot() const { + return GetField(VT_MAXSLOT, 0); } - uint32_t flagAttr() const { - return GetField(VT_FLAGATTR, 0); + u32 flagAttr() const { + return GetField(VT_FLAGATTR, 0); } const flatbuffers::Vector> *roomBinAttrInternal() const { return GetPointer> *>(VT_ROOMBINATTRINTERNAL); @@ -1736,10 +1736,10 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && - VerifyField(verifier, VT_WORLDID) && + VerifyField(verifier, VT_WORLDID) && VerifyField(verifier, VT_LOBBYID) && - VerifyField(verifier, VT_MAXSLOT) && - VerifyField(verifier, VT_FLAGATTR) && + VerifyField(verifier, VT_MAXSLOT) && + VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && verifier.VerifyVector(roomBinAttrInternal()) && verifier.VerifyVectorOfTables(roomBinAttrInternal()) && @@ -1779,17 +1779,17 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl struct CreateJoinRoomRequestBuilder { flatbuffers::FlatBufferBuilder &fbb_; flatbuffers::uoffset_t start_; - void add_worldId(uint32_t worldId) { - fbb_.AddElement(CreateJoinRoomRequest::VT_WORLDID, worldId, 0); + void add_worldId(u32 worldId) { + fbb_.AddElement(CreateJoinRoomRequest::VT_WORLDID, worldId, 0); } void add_lobbyId(uint64_t lobbyId) { fbb_.AddElement(CreateJoinRoomRequest::VT_LOBBYID, lobbyId, 0); } - void add_maxSlot(uint32_t maxSlot) { - fbb_.AddElement(CreateJoinRoomRequest::VT_MAXSLOT, maxSlot, 0); + void add_maxSlot(u32 maxSlot) { + fbb_.AddElement(CreateJoinRoomRequest::VT_MAXSLOT, maxSlot, 0); } - void add_flagAttr(uint32_t flagAttr) { - fbb_.AddElement(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0); + void add_flagAttr(u32 flagAttr) { + fbb_.AddElement(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0); } void add_roomBinAttrInternal(flatbuffers::Offset>> roomBinAttrInternal) { fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal); @@ -1844,10 +1844,10 @@ struct CreateJoinRoomRequestBuilder { inline flatbuffers::Offset CreateCreateJoinRoomRequest( flatbuffers::FlatBufferBuilder &_fbb, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t lobbyId = 0, - uint32_t maxSlot = 0, - uint32_t flagAttr = 0, + u32 maxSlot = 0, + u32 flagAttr = 0, flatbuffers::Offset>> roomBinAttrInternal = 0, flatbuffers::Offset>> roomSearchableIntAttrExternal = 0, flatbuffers::Offset>> roomSearchableBinAttrExternal = 0, @@ -1884,10 +1884,10 @@ inline flatbuffers::Offset CreateCreateJoinRoomRequest( inline flatbuffers::Offset CreateCreateJoinRoomRequestDirect( flatbuffers::FlatBufferBuilder &_fbb, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t lobbyId = 0, - uint32_t maxSlot = 0, - uint32_t flagAttr = 0, + u32 maxSlot = 0, + u32 flagAttr = 0, const std::vector> *roomBinAttrInternal = nullptr, const std::vector> *roomSearchableIntAttrExternal = nullptr, const std::vector> *roomSearchableBinAttrExternal = nullptr, @@ -2205,11 +2205,11 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - uint32_t flagFilter() const { - return GetField(VT_FLAGFILTER, 0); + u32 flagFilter() const { + return GetField(VT_FLAGFILTER, 0); } - uint32_t flagAttr() const { - return GetField(VT_FLAGATTR, 0); + u32 flagAttr() const { + return GetField(VT_FLAGATTR, 0); } const flatbuffers::Vector> *roomBinAttrInternal() const { return GetPointer> *>(VT_ROOMBINATTRINTERNAL); @@ -2226,8 +2226,8 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers: bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_ROOMID) && - VerifyField(verifier, VT_FLAGFILTER) && - VerifyField(verifier, VT_FLAGATTR) && + VerifyField(verifier, VT_FLAGFILTER) && + VerifyField(verifier, VT_FLAGATTR) && VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && verifier.VerifyVector(roomBinAttrInternal()) && verifier.VerifyVectorOfTables(roomBinAttrInternal()) && @@ -2247,11 +2247,11 @@ struct SetRoomDataInternalRequestBuilder { void add_roomId(uint64_t roomId) { fbb_.AddElement(SetRoomDataInternalRequest::VT_ROOMID, roomId, 0); } - void add_flagFilter(uint32_t flagFilter) { - fbb_.AddElement(SetRoomDataInternalRequest::VT_FLAGFILTER, flagFilter, 0); + void add_flagFilter(u32 flagFilter) { + fbb_.AddElement(SetRoomDataInternalRequest::VT_FLAGFILTER, flagFilter, 0); } - void add_flagAttr(uint32_t flagAttr) { - fbb_.AddElement(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0); + void add_flagAttr(u32 flagAttr) { + fbb_.AddElement(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0); } void add_roomBinAttrInternal(flatbuffers::Offset>> roomBinAttrInternal) { fbb_.AddOffset(SetRoomDataInternalRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal); @@ -2280,8 +2280,8 @@ struct SetRoomDataInternalRequestBuilder { inline flatbuffers::Offset CreateSetRoomDataInternalRequest( flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - uint32_t flagFilter = 0, - uint32_t flagAttr = 0, + u32 flagFilter = 0, + u32 flagAttr = 0, flatbuffers::Offset>> roomBinAttrInternal = 0, flatbuffers::Offset>> passwordConfig = 0, uint64_t passwordSlotMask = 0, @@ -2300,8 +2300,8 @@ inline flatbuffers::Offset CreateSetRoomDataInternal inline flatbuffers::Offset CreateSetRoomDataInternalRequestDirect( flatbuffers::FlatBufferBuilder &_fbb, uint64_t roomId = 0, - uint32_t flagFilter = 0, - uint32_t flagAttr = 0, + u32 flagFilter = 0, + u32 flagAttr = 0, const std::vector> *roomBinAttrInternal = nullptr, const std::vector> *passwordConfig = nullptr, uint64_t passwordSlotMask = 0, @@ -2515,21 +2515,21 @@ struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table u16 serverId() const { return GetField(VT_SERVERID, 0); } - uint32_t worldId() const { - return GetField(VT_WORLDID, 0); + u32 worldId() const { + return GetField(VT_WORLDID, 0); } uint64_t roomId() const { return GetField(VT_ROOMID, 0); } - uint32_t rtt() const { - return GetField(VT_RTT, 0); + u32 rtt() const { + return GetField(VT_RTT, 0); } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_SERVERID) && - VerifyField(verifier, VT_WORLDID) && + VerifyField(verifier, VT_WORLDID) && VerifyField(verifier, VT_ROOMID) && - VerifyField(verifier, VT_RTT) && + VerifyField(verifier, VT_RTT) && verifier.EndTable(); } }; @@ -2540,14 +2540,14 @@ struct GetPingInfoResponseBuilder { void add_serverId(u16 serverId) { fbb_.AddElement(GetPingInfoResponse::VT_SERVERID, serverId, 0); } - void add_worldId(uint32_t worldId) { - fbb_.AddElement(GetPingInfoResponse::VT_WORLDID, worldId, 0); + void add_worldId(u32 worldId) { + fbb_.AddElement(GetPingInfoResponse::VT_WORLDID, worldId, 0); } void add_roomId(uint64_t roomId) { fbb_.AddElement(GetPingInfoResponse::VT_ROOMID, roomId, 0); } - void add_rtt(uint32_t rtt) { - fbb_.AddElement(GetPingInfoResponse::VT_RTT, rtt, 0); + void add_rtt(u32 rtt) { + fbb_.AddElement(GetPingInfoResponse::VT_RTT, rtt, 0); } explicit GetPingInfoResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { @@ -2564,9 +2564,9 @@ struct GetPingInfoResponseBuilder { inline flatbuffers::Offset CreateGetPingInfoResponse( flatbuffers::FlatBufferBuilder &_fbb, u16 serverId = 0, - uint32_t worldId = 0, + u32 worldId = 0, uint64_t roomId = 0, - uint32_t rtt = 0) { + u32 rtt = 0) { GetPingInfoResponseBuilder builder_(_fbb); builder_.add_roomId(roomId); builder_.add_rtt(rtt); diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h index 9b87ce9bde..32ad246a7c 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h +++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h @@ -147,7 +147,7 @@ namespace rsx { char result[ PATH_MAX ]; #if defined(__APPLE__) - uint32_t bufsize = PATH_MAX; + u32 bufsize = PATH_MAX; bool success = _NSGetExecutablePath( result, &bufsize ) == 0; #elif defined(KERN_PROC_PATHNAME) usz bufsize = PATH_MAX; diff --git a/rpcs3/Emu/RSX/VK/VKCompute.h b/rpcs3/Emu/RSX/VK/VKCompute.h index 769005b54f..f0ea98efc9 100644 --- a/rpcs3/Emu/RSX/VK/VKCompute.h +++ b/rpcs3/Emu/RSX/VK/VKCompute.h @@ -52,7 +52,7 @@ namespace vk { bindings.push_back ({ - uint32_t(bindings.size()), + u32(bindings.size()), e.first, 1, VK_SHADER_STAGE_COMPUTE_BIT, diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index fd35d988b2..38fdbc6d70 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -294,7 +294,7 @@ namespace VkDescriptorSetLayoutCreateInfo infos = {}; infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; infos.pBindings = bindings.data(); - infos.bindingCount = static_cast(bindings.size()); + infos.bindingCount = static_cast(bindings.size()); VkDescriptorSetLayout set_layout; CHECK_RESULT(vkCreateDescriptorSetLayout(dev, &infos, nullptr, &set_layout)); @@ -469,7 +469,7 @@ VKGSRender::VKGSRender() : GSRender() { vkCreateSemaphore((*m_device), &semaphore_info, nullptr, &ctx.present_wait_semaphore); vkCreateSemaphore((*m_device), &semaphore_info, nullptr, &ctx.acquire_signal_semaphore); - ctx.descriptor_pool.create(*m_device, sizes.data(), static_cast(sizes.size()), DESCRIPTOR_MAX_DRAW_CALLS, 1); + ctx.descriptor_pool.create(*m_device, sizes.data(), static_cast(sizes.size()), DESCRIPTOR_MAX_DRAW_CALLS, 1); } const auto& memory_map = m_device->get_memory_mapping(); diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index c7431b8abc..06c381fcfa 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -238,7 +238,7 @@ namespace vk return result; } - chip_class get_chip_family(uint32_t vendor_id, uint32_t device_id) + chip_class get_chip_family(u32 vendor_id, u32 device_id) { if (vendor_id == 0x10DE) { diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index a84f0f5a71..26ade18818 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -138,13 +138,13 @@ namespace vk bool emulate_conditional_rendering(); VkFlags get_heap_compatible_buffer_types(); driver_vendor get_driver_vendor(); - chip_class get_chip_family(uint32_t vendor_id, uint32_t device_id); + chip_class get_chip_family(u32 vendor_id, u32 device_id); chip_class get_chip_family(); VkComponentMapping default_component_map(); VkComponentMapping apply_swizzle_remap(const std::array& base_remap, const std::pair, std::array>& remap_vector); VkImageSubresource default_image_subresource(); - VkImageSubresourceRange get_image_subresource_range(uint32_t base_layer, uint32_t base_mip, uint32_t layer_count, uint32_t level_count, VkImageAspectFlags aspect); + VkImageSubresourceRange get_image_subresource_range(u32 base_layer, u32 base_mip, u32 layer_count, u32 level_count, VkImageAspectFlags aspect); VkImageAspectFlags get_aspect_flags(VkFormat format); VkSampler null_sampler(); @@ -267,8 +267,8 @@ namespace vk struct memory_type_mapping { - uint32_t host_visible_coherent; - uint32_t device_local; + u32 host_visible_coherent; + u32 device_local; }; struct gpu_formats_support @@ -289,9 +289,9 @@ namespace vk struct chip_family_table { chip_class default_ = chip_class::unknown; - std::unordered_map lut; + std::unordered_map lut; - void add(uint32_t first, uint32_t last, chip_class family) + void add(u32 first, u32 last, chip_class family) { for (auto i = first; i <= last; ++i) { @@ -299,12 +299,12 @@ namespace vk } } - void add(uint32_t id, chip_class family) + void add(u32 id, chip_class family) { lut[id] = family; } - chip_class find(uint32_t device_id) + chip_class find(u32 device_id) { if (auto found = lut.find(device_id); found != lut.end()) { @@ -328,7 +328,7 @@ namespace vk virtual void destroy() = 0; - virtual mem_handle_t alloc(u64 block_sz, u64 alignment, uint32_t memory_type_index) = 0; + virtual mem_handle_t alloc(u64 block_sz, u64 alignment, u32 memory_type_index) = 0; virtual void free(mem_handle_t mem_handle) = 0; virtual void *map(mem_handle_t mem_handle, u64 offset, u64 size) = 0; virtual void unmap(mem_handle_t mem_handle) = 0; @@ -366,7 +366,7 @@ namespace vk vmaDestroyAllocator(m_allocator); } - mem_handle_t alloc(u64 block_sz, u64 alignment, uint32_t memory_type_index) override + mem_handle_t alloc(u64 block_sz, u64 alignment, u32 memory_type_index) override { VmaAllocation vma_alloc; VkMemoryRequirements mem_req = {}; @@ -473,7 +473,7 @@ namespace vk void destroy() override {} - mem_handle_t alloc(u64 block_sz, u64 /*alignment*/, uint32_t memory_type_index) override + mem_handle_t alloc(u64 block_sz, u64 /*alignment*/, u32 memory_type_index) override { VkDeviceMemory memory; VkMemoryAllocateInfo info = {}; @@ -543,7 +543,7 @@ namespace vk struct memory_block { - memory_block(VkDevice dev, u64 block_sz, u64 alignment, uint32_t memory_type_index) : m_device(dev) + memory_block(VkDevice dev, u64 block_sz, u64 alignment, u32 memory_type_index) : m_device(dev) { m_mem_allocator = get_current_mem_allocator(); m_mem_handle = m_mem_allocator->alloc(block_sz, alignment, memory_type_index); @@ -597,7 +597,7 @@ namespace vk supported_extensions(enumeration_class _class, const char* layer_name = nullptr, VkPhysicalDevice pdev = VK_NULL_HANDLE) { - uint32_t count; + u32 count; if (_class == enumeration_class::instance) { if (vkEnumerateInstanceExtensionProperties(layer_name, &count, nullptr) != VK_SUCCESS) @@ -827,22 +827,22 @@ private: return get_chip_family(props.vendorID, props.deviceID); } - uint32_t get_queue_count() const + u32 get_queue_count() const { if (!queue_props.empty()) return ::size32(queue_props); - uint32_t count = 0; + u32 count = 0; vkGetPhysicalDeviceQueueFamilyProperties(dev, &count, nullptr); return count; } - VkQueueFamilyProperties get_queue_properties(uint32_t queue) + VkQueueFamilyProperties get_queue_properties(u32 queue) { if (queue_props.empty()) { - uint32_t count = 0; + u32 count = 0; vkGetPhysicalDeviceQueueFamilyProperties(dev, &count, nullptr); queue_props.resize(count); @@ -892,7 +892,7 @@ private: render_device() = default; ~render_device() = default; - void create(vk::physical_device &pdev, uint32_t graphics_queue_idx) + void create(vk::physical_device &pdev, u32 graphics_queue_idx) { float queue_priorities[1] = { 0.f }; pgpu = &pdev; @@ -1072,7 +1072,7 @@ private: { VkPhysicalDeviceMemoryProperties mem_infos = pgpu->get_memory_properties(); - for (uint32_t i = 0; i < 32; i++) + for (u32 i = 0; i < 32; i++) { if ((typeBits & 1) == 1) { @@ -1417,7 +1417,7 @@ private: void validate(const vk::render_device& dev, const VkImageCreateInfo& info) const { const auto gpu_limits = dev.gpu().get_limits(); - uint32_t longest_dim, dim_limit; + u32 longest_dim, dim_limit; switch (info.imageType) { @@ -1455,12 +1455,12 @@ private: std::shared_ptr memory; image(const vk::render_device &dev, - uint32_t memory_type_index, - uint32_t access_flags, + u32 memory_type_index, + u32 access_flags, VkImageType image_type, VkFormat format, - uint32_t width, uint32_t height, uint32_t depth, - uint32_t mipmaps, uint32_t layers, + u32 width, u32 height, u32 depth, + u32 mipmaps, u32 layers, VkSampleCountFlagBits samples, VkImageLayout initial_layout, VkImageTiling tiling, @@ -1801,7 +1801,7 @@ private: VkBufferCreateInfo info = {}; std::unique_ptr memory; - buffer(const vk::render_device& dev, u64 size, uint32_t memory_type_index, uint32_t access_flags, VkBufferUsageFlags usage, VkBufferCreateFlags flags) + buffer(const vk::render_device& dev, u64 size, u32 memory_type_index, u32 access_flags, VkBufferUsageFlags usage, VkBufferCreateFlags flags) : m_device(dev) { info.size = size; @@ -1908,7 +1908,7 @@ private: VkEvent m_vk_event = VK_NULL_HANDLE; std::unique_ptr m_buffer; - volatile uint32_t* m_value = nullptr; + volatile u32* m_value = nullptr; public: event(const render_device& dev) @@ -1937,7 +1937,7 @@ private: 0 ); - m_value = reinterpret_cast(m_buffer->map(0, 4)); + m_value = reinterpret_cast(m_buffer->map(0, 4)); *m_value = 0xCAFEBABE; } } @@ -2063,7 +2063,7 @@ private: info.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; info.width = width; info.height = height; - info.attachmentCount = static_cast(image_view_array.size()); + info.attachmentCount = static_cast(image_view_array.size()); info.pAttachments = image_view_array.data(); info.renderPass = pass; info.layers = 1; @@ -2176,8 +2176,8 @@ public: protected: render_device dev; - uint32_t m_present_queue = UINT32_MAX; - uint32_t m_graphics_queue = UINT32_MAX; + u32 m_present_queue = UINT32_MAX; + u32 m_graphics_queue = UINT32_MAX; VkQueue vk_graphics_queue = VK_NULL_HANDLE; VkQueue vk_present_queue = VK_NULL_HANDLE; @@ -2189,7 +2189,7 @@ public: virtual void init_swapchain_images(render_device& dev, u32 count) = 0; public: - swapchain_base(physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + swapchain_base(physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) { dev.create(gpu, _graphics_queue); @@ -2259,7 +2259,7 @@ public: std::vector swapchain_images; public: - abstract_swapchain_impl(physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + abstract_swapchain_impl(physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) : swapchain_base(gpu, _present_queue, _graphics_queue, format) {} @@ -2286,7 +2286,7 @@ public: LPVOID hPtr = NULL; public: - swapchain_WIN32(physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + swapchain_WIN32(physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) : native_swapchain_base(gpu, _present_queue, _graphics_queue, format) {} @@ -2369,7 +2369,7 @@ public: void* nsView = nullptr; public: - swapchain_MacOS(physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + swapchain_MacOS(physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) : native_swapchain_base(gpu, _present_queue, _graphics_queue, format) {} @@ -2419,7 +2419,7 @@ public: int bit_depth = 24; public: - swapchain_X11(physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + swapchain_X11(physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) : native_swapchain_base(gpu, _present_queue, _graphics_queue, format) {} @@ -2521,7 +2521,7 @@ public: { public: - swapchain_Wayland(physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) + swapchain_Wayland(physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format = VK_FORMAT_B8G8R8A8_UNORM) : native_swapchain_base(gpu, _present_queue, _graphics_queue, format) {} @@ -2627,7 +2627,7 @@ public: } public: - swapchain_WSI(vk::physical_device &gpu, uint32_t _present_queue, uint32_t _graphics_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off) + swapchain_WSI(vk::physical_device &gpu, u32 _present_queue, u32 _graphics_queue, VkFormat format, VkSurfaceKHR surface, VkColorSpaceKHR color_space, bool force_wm_reporting_off) : WSI_swapchain_base(gpu, _present_queue, _graphics_queue, format) { createSwapchainKHR = reinterpret_cast(vkGetDeviceProcAddr(dev, "vkCreateSwapchainKHR")); @@ -2720,7 +2720,7 @@ public: m_height = surface_descriptors.currentExtent.height; } - uint32_t nb_available_modes = 0; + u32 nb_available_modes = 0; CHECK_RESULT(vkGetPhysicalDeviceSurfacePresentModesKHR(gpu, m_surface, &nb_available_modes, nullptr)); std::vector present_modes(nb_available_modes); @@ -2759,7 +2759,7 @@ public: rsx_log.notice("Swapchain: present mode %d in use.", static_cast(swapchain_present_mode)); - uint32_t nb_swap_images = surface_descriptors.minImageCount + 1; + u32 nb_swap_images = surface_descriptors.minImageCount + 1; if (surface_descriptors.maxImageCount > 0) { //Try to negotiate for a triple buffer setup @@ -2979,9 +2979,9 @@ public: VkInstanceCreateInfo instance_info = {}; instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.pApplicationInfo = &app; - instance_info.enabledLayerCount = static_cast(layers.size()); + instance_info.enabledLayerCount = static_cast(layers.size()); instance_info.ppEnabledLayerNames = layers.data(); - instance_info.enabledExtensionCount = fast ? 0 : static_cast(extensions.size()); + instance_info.enabledExtensionCount = fast ? 0 : static_cast(extensions.size()); instance_info.ppEnabledExtensionNames = fast ? nullptr : extensions.data(); if (VkResult result = vkCreateInstance(&instance_info, nullptr, &m_instance); result != VK_SUCCESS) @@ -3018,7 +3018,7 @@ public: std::vector& enumerateDevices() { - uint32_t num_gpus; + u32 num_gpus; // This may fail on unsupported drivers, so just assume no devices if (vkEnumeratePhysicalDevices(m_instance, &num_gpus, nullptr) != VK_SUCCESS) return gpus; @@ -3098,7 +3098,7 @@ public: }, window_handle); #endif - uint32_t device_queues = dev.get_queue_count(); + u32 device_queues = dev.get_queue_count(); std::vector supportsPresent(device_queues, VK_FALSE); bool present_possible = false; @@ -3123,8 +3123,8 @@ public: // Search for a graphics and a present queue in the array of queue // families, try to find one that supports both - uint32_t graphicsQueueNodeIndex = UINT32_MAX; - uint32_t presentQueueNodeIndex = UINT32_MAX; + u32 graphicsQueueNodeIndex = UINT32_MAX; + u32 presentQueueNodeIndex = UINT32_MAX; for (u32 i = 0; i < device_queues; i++) { @@ -3147,7 +3147,7 @@ public: { // If didn't find a queue that supports both graphics and present, then // find a separate present queue. - for (uint32_t i = 0; i < device_queues; ++i) + for (u32 i = 0; i < device_queues; ++i) { if (supportsPresent[i] == VK_TRUE) { @@ -3179,7 +3179,7 @@ public: } // Get the list of VkFormat's that are supported: - uint32_t formatCount; + u32 formatCount; CHECK_RESULT(vkGetPhysicalDeviceSurfaceFormatsKHR(dev, m_surface, &formatCount, nullptr)); std::vector surfFormats(formatCount); @@ -3663,11 +3663,11 @@ public: bool has_uniform(program_input_type type, const std::string &uniform_name); void bind_uniform(const VkDescriptorImageInfo &image_descriptor, const std::string &uniform_name, VkDescriptorType type, VkDescriptorSet &descriptor_set); void bind_uniform(const VkDescriptorImageInfo &image_descriptor, int texture_unit, ::glsl::program_domain domain, VkDescriptorSet &descriptor_set, bool is_stencil_mirror = false); - void bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, uint32_t binding_point, VkDescriptorSet &descriptor_set); - void bind_uniform(const VkBufferView &buffer_view, uint32_t binding_point, VkDescriptorSet &descriptor_set); + void bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorSet &descriptor_set); + void bind_uniform(const VkBufferView &buffer_view, u32 binding_point, VkDescriptorSet &descriptor_set); void bind_uniform(const VkBufferView &buffer_view, program_input_type type, const std::string &binding_name, VkDescriptorSet &descriptor_set); - void bind_buffer(const VkDescriptorBufferInfo &buffer_descriptor, uint32_t binding_point, VkDescriptorType type, VkDescriptorSet &descriptor_set); + void bind_buffer(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorType type, VkDescriptorSet &descriptor_set); void bind_descriptor_set(const VkCommandBuffer cmd, VkDescriptorSet descriptor_set); }; } diff --git a/rpcs3/Emu/RSX/VK/VKOverlays.h b/rpcs3/Emu/RSX/VK/VKOverlays.h index 0de15191dc..a337094e40 100644 --- a/rpcs3/Emu/RSX/VK/VKOverlays.h +++ b/rpcs3/Emu/RSX/VK/VKOverlays.h @@ -1011,7 +1011,7 @@ namespace vk vkCmdSetScissor(cmd, 0, 1, ®ion); } - void run(vk::command_buffer& cmd, vk::render_target* target, VkRect2D rect, uint32_t stencil_clear, uint32_t stencil_write_mask, VkRenderPass render_pass) + void run(vk::command_buffer& cmd, vk::render_target* target, VkRect2D rect, u32 stencil_clear, u32 stencil_write_mask, VkRenderPass render_pass) { region = rect; diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp index dc55f63e82..175c155890 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp @@ -169,12 +169,12 @@ namespace vk rsx_log.notice("texture not found in program: %stex%u", (domain == ::glsl::program_domain::glsl_vertex_program)? "v" : "", texture_unit); } - void program::bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, uint32_t binding_point, VkDescriptorSet &descriptor_set) + void program::bind_uniform(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorSet &descriptor_set) { bind_buffer(buffer_descriptor, binding_point, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, descriptor_set); } - void program::bind_uniform(const VkBufferView &buffer_view, uint32_t binding_point, VkDescriptorSet &descriptor_set) + void program::bind_uniform(const VkBufferView &buffer_view, u32 binding_point, VkDescriptorSet &descriptor_set) { const VkWriteDescriptorSet descriptor_writer = { @@ -208,7 +208,7 @@ namespace vk rsx_log.notice("vertex buffer not found in program: %s", binding_name.c_str()); } - void program::bind_buffer(const VkDescriptorBufferInfo &buffer_descriptor, uint32_t binding_point, VkDescriptorType type, VkDescriptorSet &descriptor_set) + void program::bind_buffer(const VkDescriptorBufferInfo &buffer_descriptor, u32 binding_point, VkDescriptorType type, VkDescriptorSet &descriptor_set) { const VkWriteDescriptorSet descriptor_writer = { diff --git a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp b/rpcs3/Emu/RSX/VK/VKRenderPass.cpp index fd6987470c..a8d647e16b 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderPass.cpp +++ b/rpcs3/Emu/RSX/VK/VKRenderPass.cpp @@ -204,7 +204,7 @@ namespace vk VkRenderPassCreateInfo rp_info = {}; rp_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; - rp_info.attachmentCount = static_cast(attachments.size()); + rp_info.attachmentCount = static_cast(attachments.size()); rp_info.pAttachments = attachments.data(); rp_info.subpassCount = 1; rp_info.pSubpasses = &subpass; diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h index 6a5d0807d2..740cadefa8 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -652,7 +652,7 @@ namespace rsx VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_TYPE_2D, requested_format, - static_cast(width_), static_cast(height_), 1, 1, 1, + static_cast(width_), static_cast(height_), 1, 1, 1, static_cast(samples), VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL, @@ -712,7 +712,7 @@ namespace rsx VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_IMAGE_TYPE_2D, requested_format, - static_cast(width_), static_cast(height_), 1, 1, 1, + static_cast(width_), static_cast(height_), 1, 1, 1, static_cast(samples), VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_TILING_OPTIMAL, diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp index a3c4ca7074..a5f0beaca8 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.cpp @@ -232,7 +232,7 @@ namespace vk const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table(); std::vector bindings(binding_table.total_descriptor_bindings); - uint32_t idx = 0; + u32 idx = 0; // Vertex stream, one stream for cacheable data, one stream for transient data. Third stream contains vertex layout info for (int i = 0; i < 3; i++) @@ -360,7 +360,7 @@ namespace vk VkDescriptorSetLayoutCreateInfo infos = {}; infos.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; infos.pBindings = bindings.data(); - infos.bindingCount = static_cast(bindings.size()); + infos.bindingCount = static_cast(bindings.size()); VkDescriptorSetLayout set_layout; CHECK_RESULT(vkCreateDescriptorSetLayout(dev, &infos, nullptr, &set_layout)); @@ -511,7 +511,7 @@ namespace vk void shader_interpreter::update_fragment_textures(const std::array& sampled_images, VkDescriptorSet descriptor_set) { const VkDescriptorImageInfo* texture_ptr = sampled_images.data(); - for (uint32_t i = 0, binding = m_fragment_textures_start; i < 4; ++i, ++binding, texture_ptr += 16) + for (u32 i = 0, binding = m_fragment_textures_start; i < 4; ++i, ++binding, texture_ptr += 16) { const VkWriteDescriptorSet descriptor_writer = { @@ -621,12 +621,12 @@ namespace vk return prog == m_current_interpreter; } - uint32_t shader_interpreter::get_vertex_instruction_location() const + u32 shader_interpreter::get_vertex_instruction_location() const { return m_vertex_instruction_start; } - uint32_t shader_interpreter::get_fragment_instruction_location() const + u32 shader_interpreter::get_fragment_instruction_location() const { return m_fragment_instruction_start; } diff --git a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h index ac3c1d3dd7..c62e7cdc6c 100644 --- a/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h +++ b/rpcs3/Emu/RSX/VK/VKShaderInterpreter.h @@ -42,9 +42,9 @@ namespace vk vk::descriptor_pool m_descriptor_pool; usz m_used_descriptors = 0; - uint32_t m_vertex_instruction_start = 0; - uint32_t m_fragment_instruction_start = 0; - uint32_t m_fragment_textures_start = 0; + u32 m_vertex_instruction_start = 0; + u32 m_fragment_instruction_start = 0; + u32 m_fragment_textures_start = 0; pipeline_key m_current_key{}; @@ -62,8 +62,8 @@ namespace vk glsl::program* get(const vk::pipeline_props& properties, const program_hash_util::fragment_program_utils::fragment_program_metadata& metadata); bool is_interpreter(const glsl::program* prog) const; - uint32_t get_vertex_instruction_location() const; - uint32_t get_fragment_instruction_location() const; + u32 get_vertex_instruction_location() const; + u32 get_fragment_instruction_location() const; void update_fragment_textures(const std::array& sampled_images, VkDescriptorSet descriptor_set); VkDescriptorSet allocate_descriptor_set(); diff --git a/rpcs3/Emu/RSX/VK/VKTexture.cpp b/rpcs3/Emu/RSX/VK/VKTexture.cpp index 5716f62490..9d095b6a2c 100644 --- a/rpcs3/Emu/RSX/VK/VKTexture.cpp +++ b/rpcs3/Emu/RSX/VK/VKTexture.cpp @@ -30,7 +30,7 @@ namespace vk return subres; } - VkImageSubresourceRange get_image_subresource_range(uint32_t base_layer, uint32_t base_mip, uint32_t layer_count, uint32_t level_count, VkImageAspectFlags aspect) + VkImageSubresourceRange get_image_subresource_range(u32 base_layer, u32 base_mip, u32 layer_count, u32 level_count, VkImageAspectFlags aspect) { VkImageSubresourceRange subres = {}; subres.aspectMask = aspect; diff --git a/rpcs3/Emu/RSX/gcm_printing.cpp b/rpcs3/Emu/RSX/gcm_printing.cpp index 3f932fa429..7276a6af6d 100644 --- a/rpcs3/Emu/RSX/gcm_printing.cpp +++ b/rpcs3/Emu/RSX/gcm_printing.cpp @@ -1121,7 +1121,7 @@ namespace template auto create_printing_table(std::integer_sequence seq) { - std::unordered_map result; + std::unordered_map result; (result.insert({ {opcode_list[Index * 5 + 0], ®ister_pretty_printing}, {opcode_list[Index * 5 + 1], ®ister_pretty_printing}, diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h index 8a3fdf6c9a..13eec49a14 100644 --- a/rpcs3/Emu/RSX/rsx_decode.h +++ b/rpcs3/Emu/RSX/rsx_decode.h @@ -38,7 +38,7 @@ namespace rsx std::string to_string(shading_mode op); std::string to_string(polygon_mode op); -template +template struct registers_decoder {}; diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index 010b1619c7..167ed16372 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -27,7 +27,7 @@ namespace rsx using utils::next_page; using flags64_t = uint64_t; - using flags32_t = uint32_t; + using flags32_t = u32; using flags16_t = u16; using flags8_t = u8; diff --git a/rpcs3/rpcs3qt/localized.h b/rpcs3/rpcs3qt/localized.h index 56911c4230..34cce73299 100644 --- a/rpcs3/rpcs3qt/localized.h +++ b/rpcs3/rpcs3qt/localized.h @@ -5,6 +5,8 @@ #include #include +#include "util/types.hpp" + typedef std::map localized_cat; using namespace category; @@ -93,7 +95,7 @@ public: { // These values are partly generalized. They can vary between country and category // Normally only values 1,2,3,5,7 and 9 are used - const std::map level + const std::map level { { 1, tr("0+") }, { 2, tr("3+") }, @@ -112,7 +114,7 @@ public: const struct resolution { // there might be different values for other categories - const std::map mode + const std::map mode { { 1 << 0, tr("480p") }, { 1 << 1, tr("576p") }, @@ -125,7 +127,7 @@ public: const struct sound { - const std::map format + const std::map format { { 1 << 0, tr("LPCM 2.0") }, //{ 1 << 1, tr("LPCM ???") },