mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-04-20 03:25:16 +00:00
Replace uint32_t with u32
This commit is contained in:
Nekotekina
parent
ae633292c0
commit
77352a2a86
19 changed files with 262 additions and 260 deletions
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -823,7 +823,7 @@ error_code cellRtcSetTick(vm::ptr<CellRtcDateTime> pTime, vm::cptr<CellRtcTick>
|
|||
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)
|
||||
|
|
|
|||
|
|
@ -132,13 +132,13 @@ struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
u16 id() const {
|
||||
return GetField<u16>(VT_ID, 0);
|
||||
}
|
||||
uint32_t num() const {
|
||||
return GetField<uint32_t>(VT_NUM, 0);
|
||||
u32 num() const {
|
||||
return GetField<u32>(VT_NUM, 0);
|
||||
}
|
||||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<u16>(verifier, VT_ID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_NUM) &&
|
||||
VerifyField<u32>(verifier, VT_NUM) &&
|
||||
verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
|
@ -149,8 +149,8 @@ struct IntAttrBuilder {
|
|||
void add_id(u16 id) {
|
||||
fbb_.AddElement<u16>(IntAttr::VT_ID, id, 0);
|
||||
}
|
||||
void add_num(uint32_t num) {
|
||||
fbb_.AddElement<uint32_t>(IntAttr::VT_NUM, num, 0);
|
||||
void add_num(u32 num) {
|
||||
fbb_.AddElement<u32>(IntAttr::VT_NUM, num, 0);
|
||||
}
|
||||
explicit IntAttrBuilder(flatbuffers::FlatBufferBuilder &_fbb)
|
||||
: fbb_(_fbb) {
|
||||
|
|
@ -167,7 +167,7 @@ struct IntAttrBuilder {
|
|||
inline flatbuffers::Offset<IntAttr> 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<uint32_t>(VT_SLOTNUM, 0);
|
||||
u32 slotNum() const {
|
||||
return GetField<u32>(VT_SLOTNUM, 0);
|
||||
}
|
||||
bool withLabel() const {
|
||||
return GetField<u8>(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<uint32_t>(verifier, VT_SLOTNUM) &&
|
||||
VerifyField<u32>(verifier, VT_SLOTNUM) &&
|
||||
VerifyField<u8>(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<uint32_t>(GroupConfig::VT_SLOTNUM, slotNum, 0);
|
||||
void add_slotNum(u32 slotNum) {
|
||||
fbb_.AddElement<u32>(GroupConfig::VT_SLOTNUM, slotNum, 0);
|
||||
}
|
||||
void add_withLabel(bool withLabel) {
|
||||
fbb_.AddElement<u8>(GroupConfig::VT_WITHLABEL, static_cast<u8>(withLabel), 0);
|
||||
|
|
@ -405,7 +405,7 @@ struct GroupConfigBuilder {
|
|||
|
||||
inline flatbuffers::Offset<GroupConfig> CreateGroupConfig(
|
||||
flatbuffers::FlatBufferBuilder &_fbb,
|
||||
uint32_t slotNum = 0,
|
||||
u32 slotNum = 0,
|
||||
bool withLabel = false,
|
||||
flatbuffers::Offset<flatbuffers::Vector<u8>> label = 0,
|
||||
bool withPassword = false) {
|
||||
|
|
@ -419,7 +419,7 @@ inline flatbuffers::Offset<GroupConfig> CreateGroupConfig(
|
|||
|
||||
inline flatbuffers::Offset<GroupConfig> CreateGroupConfigDirect(
|
||||
flatbuffers::FlatBufferBuilder &_fbb,
|
||||
uint32_t slotNum = 0,
|
||||
u32 slotNum = 0,
|
||||
bool withLabel = false,
|
||||
const std::vector<u8> *label = nullptr,
|
||||
bool withPassword = false) {
|
||||
|
|
@ -539,8 +539,8 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab
|
|||
u8 natType() const {
|
||||
return GetField<u8>(VT_NATTYPE, 0);
|
||||
}
|
||||
uint32_t flagAttr() const {
|
||||
return GetField<uint32_t>(VT_FLAGATTR, 0);
|
||||
u32 flagAttr() const {
|
||||
return GetField<u32>(VT_FLAGATTR, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>> *roomMemberBinAttrInternal() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>> *>(VT_ROOMMEMBERBINATTRINTERNAL);
|
||||
|
|
@ -554,7 +554,7 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab
|
|||
VerifyField<u8>(verifier, VT_TEAMID) &&
|
||||
VerifyField<u8>(verifier, VT_ROOMGROUP) &&
|
||||
VerifyField<u8>(verifier, VT_NATTYPE) &&
|
||||
VerifyField<uint32_t>(verifier, VT_FLAGATTR) &&
|
||||
VerifyField<u32>(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<u8>(RoomMemberDataInternal::VT_NATTYPE, natType, 0);
|
||||
}
|
||||
void add_flagAttr(uint32_t flagAttr) {
|
||||
fbb_.AddElement<uint32_t>(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0);
|
||||
void add_flagAttr(u32 flagAttr) {
|
||||
fbb_.AddElement<u32>(RoomMemberDataInternal::VT_FLAGATTR, flagAttr, 0);
|
||||
}
|
||||
void add_roomMemberBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>>> roomMemberBinAttrInternal) {
|
||||
fbb_.AddOffset(RoomMemberDataInternal::VT_ROOMMEMBERBINATTRINTERNAL, roomMemberBinAttrInternal);
|
||||
|
|
@ -609,7 +609,7 @@ inline flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInternal(
|
|||
u8 teamId = 0,
|
||||
u8 roomGroup = 0,
|
||||
u8 natType = 0,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagAttr = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<MemberBinAttrInternal>>> roomMemberBinAttrInternal = 0) {
|
||||
RoomMemberDataInternalBuilder builder_(_fbb);
|
||||
builder_.add_joinDate(joinDate);
|
||||
|
|
@ -631,7 +631,7 @@ inline flatbuffers::Offset<RoomMemberDataInternal> CreateRoomMemberDataInternalD
|
|||
u8 teamId = 0,
|
||||
u8 roomGroup = 0,
|
||||
u8 natType = 0,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagAttr = 0,
|
||||
const std::vector<flatbuffers::Offset<MemberBinAttrInternal>> *roomMemberBinAttrInternal = nullptr) {
|
||||
auto roomMemberBinAttrInternal__ = roomMemberBinAttrInternal ? _fbb.CreateVector<flatbuffers::Offset<MemberBinAttrInternal>>(*roomMemberBinAttrInternal) : 0;
|
||||
return CreateRoomMemberDataInternal(
|
||||
|
|
@ -667,11 +667,11 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
const flatbuffers::Vector<u8> *label() const {
|
||||
return GetPointer<const flatbuffers::Vector<u8> *>(VT_LABEL);
|
||||
}
|
||||
uint32_t slotNum() const {
|
||||
return GetField<uint32_t>(VT_SLOTNUM, 0);
|
||||
u32 slotNum() const {
|
||||
return GetField<u32>(VT_SLOTNUM, 0);
|
||||
}
|
||||
uint32_t curGroupMemberNum() const {
|
||||
return GetField<uint32_t>(VT_CURGROUPMEMBERNUM, 0);
|
||||
u32 curGroupMemberNum() const {
|
||||
return GetField<u32>(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<u8>(verifier, VT_WITHLABEL) &&
|
||||
VerifyOffset(verifier, VT_LABEL) &&
|
||||
verifier.VerifyVector(label()) &&
|
||||
VerifyField<uint32_t>(verifier, VT_SLOTNUM) &&
|
||||
VerifyField<uint32_t>(verifier, VT_CURGROUPMEMBERNUM) &&
|
||||
VerifyField<u32>(verifier, VT_SLOTNUM) &&
|
||||
VerifyField<u32>(verifier, VT_CURGROUPMEMBERNUM) &&
|
||||
verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
|
@ -701,11 +701,11 @@ struct RoomGroupBuilder {
|
|||
void add_label(flatbuffers::Offset<flatbuffers::Vector<u8>> label) {
|
||||
fbb_.AddOffset(RoomGroup::VT_LABEL, label);
|
||||
}
|
||||
void add_slotNum(uint32_t slotNum) {
|
||||
fbb_.AddElement<uint32_t>(RoomGroup::VT_SLOTNUM, slotNum, 0);
|
||||
void add_slotNum(u32 slotNum) {
|
||||
fbb_.AddElement<u32>(RoomGroup::VT_SLOTNUM, slotNum, 0);
|
||||
}
|
||||
void add_curGroupMemberNum(uint32_t curGroupMemberNum) {
|
||||
fbb_.AddElement<uint32_t>(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0);
|
||||
void add_curGroupMemberNum(u32 curGroupMemberNum) {
|
||||
fbb_.AddElement<u32>(RoomGroup::VT_CURGROUPMEMBERNUM, curGroupMemberNum, 0);
|
||||
}
|
||||
explicit RoomGroupBuilder(flatbuffers::FlatBufferBuilder &_fbb)
|
||||
: fbb_(_fbb) {
|
||||
|
|
@ -725,8 +725,8 @@ inline flatbuffers::Offset<RoomGroup> CreateRoomGroup(
|
|||
bool withPassword = false,
|
||||
bool withLabel = false,
|
||||
flatbuffers::Offset<flatbuffers::Vector<u8>> 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<RoomGroup> CreateRoomGroupDirect(
|
|||
bool withPassword = false,
|
||||
bool withLabel = false,
|
||||
const std::vector<u8> *label = nullptr,
|
||||
uint32_t slotNum = 0,
|
||||
uint32_t curGroupMemberNum = 0) {
|
||||
u32 slotNum = 0,
|
||||
u32 curGroupMemberNum = 0) {
|
||||
auto label__ = label ? _fbb.CreateVector<u8>(*label) : 0;
|
||||
return CreateRoomGroup(
|
||||
_fbb,
|
||||
|
|
@ -773,8 +773,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
u16 serverId() const {
|
||||
return GetField<u16>(VT_SERVERID, 0);
|
||||
}
|
||||
uint32_t worldId() const {
|
||||
return GetField<uint32_t>(VT_WORLDID, 0);
|
||||
u32 worldId() const {
|
||||
return GetField<u32>(VT_WORLDID, 0);
|
||||
}
|
||||
uint64_t lobbyId() const {
|
||||
return GetField<uint64_t>(VT_LOBBYID, 0);
|
||||
|
|
@ -785,8 +785,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
uint64_t passwordSlotMask() const {
|
||||
return GetField<uint64_t>(VT_PASSWORDSLOTMASK, 0);
|
||||
}
|
||||
uint32_t maxSlot() const {
|
||||
return GetField<uint32_t>(VT_MAXSLOT, 0);
|
||||
u32 maxSlot() const {
|
||||
return GetField<u32>(VT_MAXSLOT, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>> *memberList() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>> *>(VT_MEMBERLIST);
|
||||
|
|
@ -797,8 +797,8 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *roomGroup() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *>(VT_ROOMGROUP);
|
||||
}
|
||||
uint32_t flagAttr() const {
|
||||
return GetField<uint32_t>(VT_FLAGATTR, 0);
|
||||
u32 flagAttr() const {
|
||||
return GetField<u32>(VT_FLAGATTR, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>> *roomBinAttrInternal() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>> *>(VT_ROOMBINATTRINTERNAL);
|
||||
|
|
@ -806,11 +806,11 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<u16>(verifier, VT_SERVERID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_WORLDID) &&
|
||||
VerifyField<u32>(verifier, VT_WORLDID) &&
|
||||
VerifyField<uint64_t>(verifier, VT_LOBBYID) &&
|
||||
VerifyField<uint64_t>(verifier, VT_ROOMID) &&
|
||||
VerifyField<uint64_t>(verifier, VT_PASSWORDSLOTMASK) &&
|
||||
VerifyField<uint32_t>(verifier, VT_MAXSLOT) &&
|
||||
VerifyField<u32>(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<uint32_t>(verifier, VT_FLAGATTR) &&
|
||||
VerifyField<u32>(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<u16>(RoomDataInternal::VT_SERVERID, serverId, 0);
|
||||
}
|
||||
void add_worldId(uint32_t worldId) {
|
||||
fbb_.AddElement<uint32_t>(RoomDataInternal::VT_WORLDID, worldId, 0);
|
||||
void add_worldId(u32 worldId) {
|
||||
fbb_.AddElement<u32>(RoomDataInternal::VT_WORLDID, worldId, 0);
|
||||
}
|
||||
void add_lobbyId(uint64_t lobbyId) {
|
||||
fbb_.AddElement<uint64_t>(RoomDataInternal::VT_LOBBYID, lobbyId, 0);
|
||||
|
|
@ -844,8 +844,8 @@ struct RoomDataInternalBuilder {
|
|||
void add_passwordSlotMask(uint64_t passwordSlotMask) {
|
||||
fbb_.AddElement<uint64_t>(RoomDataInternal::VT_PASSWORDSLOTMASK, passwordSlotMask, 0);
|
||||
}
|
||||
void add_maxSlot(uint32_t maxSlot) {
|
||||
fbb_.AddElement<uint32_t>(RoomDataInternal::VT_MAXSLOT, maxSlot, 0);
|
||||
void add_maxSlot(u32 maxSlot) {
|
||||
fbb_.AddElement<u32>(RoomDataInternal::VT_MAXSLOT, maxSlot, 0);
|
||||
}
|
||||
void add_memberList(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>>> memberList) {
|
||||
fbb_.AddOffset(RoomDataInternal::VT_MEMBERLIST, memberList);
|
||||
|
|
@ -856,8 +856,8 @@ struct RoomDataInternalBuilder {
|
|||
void add_roomGroup(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup) {
|
||||
fbb_.AddOffset(RoomDataInternal::VT_ROOMGROUP, roomGroup);
|
||||
}
|
||||
void add_flagAttr(uint32_t flagAttr) {
|
||||
fbb_.AddElement<uint32_t>(RoomDataInternal::VT_FLAGATTR, flagAttr, 0);
|
||||
void add_flagAttr(u32 flagAttr) {
|
||||
fbb_.AddElement<u32>(RoomDataInternal::VT_FLAGATTR, flagAttr, 0);
|
||||
}
|
||||
void add_roomBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>>> roomBinAttrInternal) {
|
||||
fbb_.AddOffset(RoomDataInternal::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal);
|
||||
|
|
@ -877,15 +877,15 @@ struct RoomDataInternalBuilder {
|
|||
inline flatbuffers::Offset<RoomDataInternal> 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<flatbuffers::Vector<flatbuffers::Offset<RoomMemberDataInternal>>> memberList = 0,
|
||||
u16 ownerId = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup = 0,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagAttr = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttrInternal>>> roomBinAttrInternal = 0) {
|
||||
RoomDataInternalBuilder builder_(_fbb);
|
||||
builder_.add_passwordSlotMask(passwordSlotMask);
|
||||
|
|
@ -905,15 +905,15 @@ inline flatbuffers::Offset<RoomDataInternal> CreateRoomDataInternal(
|
|||
inline flatbuffers::Offset<RoomDataInternal> 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<flatbuffers::Offset<RoomMemberDataInternal>> *memberList = nullptr,
|
||||
u16 ownerId = 0,
|
||||
const std::vector<flatbuffers::Offset<RoomGroup>> *roomGroup = nullptr,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagAttr = 0,
|
||||
const std::vector<flatbuffers::Offset<BinAttrInternal>> *roomBinAttrInternal = nullptr) {
|
||||
auto memberList__ = memberList ? _fbb.CreateVector<flatbuffers::Offset<RoomMemberDataInternal>>(*memberList) : 0;
|
||||
auto roomGroup__ = roomGroup ? _fbb.CreateVector<flatbuffers::Offset<RoomGroup>>(*roomGroup) : 0;
|
||||
|
|
@ -956,8 +956,8 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
u16 serverId() const {
|
||||
return GetField<u16>(VT_SERVERID, 0);
|
||||
}
|
||||
uint32_t worldId() const {
|
||||
return GetField<uint32_t>(VT_WORLDID, 0);
|
||||
u32 worldId() const {
|
||||
return GetField<u32>(VT_WORLDID, 0);
|
||||
}
|
||||
u16 publicSlotNum() const {
|
||||
return GetField<u16>(VT_PUBLICSLOTNUM, 0);
|
||||
|
|
@ -992,8 +992,8 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *roomGroup() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomGroup>> *>(VT_ROOMGROUP);
|
||||
}
|
||||
uint32_t flagAttr() const {
|
||||
return GetField<uint32_t>(VT_FLAGATTR, 0);
|
||||
u32 flagAttr() const {
|
||||
return GetField<u32>(VT_FLAGATTR, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<IntAttr>> *>(VT_ROOMSEARCHABLEINTATTREXTERNAL);
|
||||
|
|
@ -1007,7 +1007,7 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<u16>(verifier, VT_SERVERID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_WORLDID) &&
|
||||
VerifyField<u32>(verifier, VT_WORLDID) &&
|
||||
VerifyField<u16>(verifier, VT_PUBLICSLOTNUM) &&
|
||||
VerifyField<u16>(verifier, VT_PRIVATESLOTNUM) &&
|
||||
VerifyField<uint64_t>(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<uint32_t>(verifier, VT_FLAGATTR) &&
|
||||
VerifyField<u32>(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<u16>(RoomDataExternal::VT_SERVERID, serverId, 0);
|
||||
}
|
||||
void add_worldId(uint32_t worldId) {
|
||||
fbb_.AddElement<uint32_t>(RoomDataExternal::VT_WORLDID, worldId, 0);
|
||||
void add_worldId(u32 worldId) {
|
||||
fbb_.AddElement<u32>(RoomDataExternal::VT_WORLDID, worldId, 0);
|
||||
}
|
||||
void add_publicSlotNum(u16 publicSlotNum) {
|
||||
fbb_.AddElement<u16>(RoomDataExternal::VT_PUBLICSLOTNUM, publicSlotNum, 0);
|
||||
|
|
@ -1078,8 +1078,8 @@ struct RoomDataExternalBuilder {
|
|||
void add_roomGroup(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup) {
|
||||
fbb_.AddOffset(RoomDataExternal::VT_ROOMGROUP, roomGroup);
|
||||
}
|
||||
void add_flagAttr(uint32_t flagAttr) {
|
||||
fbb_.AddElement<uint32_t>(RoomDataExternal::VT_FLAGATTR, flagAttr, 0);
|
||||
void add_flagAttr(u32 flagAttr) {
|
||||
fbb_.AddElement<u32>(RoomDataExternal::VT_FLAGATTR, flagAttr, 0);
|
||||
}
|
||||
void add_roomSearchableIntAttrExternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal) {
|
||||
fbb_.AddOffset(RoomDataExternal::VT_ROOMSEARCHABLEINTATTREXTERNAL, roomSearchableIntAttrExternal);
|
||||
|
|
@ -1105,7 +1105,7 @@ struct RoomDataExternalBuilder {
|
|||
inline flatbuffers::Offset<RoomDataExternal> 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<RoomDataExternal> CreateRoomDataExternal(
|
|||
uint64_t passwordSlotMask = 0,
|
||||
flatbuffers::Offset<UserInfo2> owner = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroup>>> roomGroup = 0,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagAttr = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrExternal = 0) {
|
||||
|
|
@ -1145,7 +1145,7 @@ inline flatbuffers::Offset<RoomDataExternal> CreateRoomDataExternal(
|
|||
inline flatbuffers::Offset<RoomDataExternal> 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<RoomDataExternal> CreateRoomDataExternalDirect(
|
|||
uint64_t passwordSlotMask = 0,
|
||||
flatbuffers::Offset<UserInfo2> owner = 0,
|
||||
const std::vector<flatbuffers::Offset<RoomGroup>> *roomGroup = nullptr,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagAttr = 0,
|
||||
const std::vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
|
||||
const std::vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
|
||||
const std::vector<flatbuffers::Offset<BinAttr>> *roomBinAttrExternal = nullptr) {
|
||||
|
|
@ -1296,14 +1296,14 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
const flatbuffers::Vector<u8> *data() const {
|
||||
return GetPointer<const flatbuffers::Vector<u8> *>(VT_DATA);
|
||||
}
|
||||
uint32_t len() const {
|
||||
return GetField<uint32_t>(VT_LEN, 0);
|
||||
u32 len() const {
|
||||
return GetField<u32>(VT_LEN, 0);
|
||||
}
|
||||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyOffset(verifier, VT_DATA) &&
|
||||
verifier.VerifyVector(data()) &&
|
||||
VerifyField<uint32_t>(verifier, VT_LEN) &&
|
||||
VerifyField<u32>(verifier, VT_LEN) &&
|
||||
verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
|
@ -1314,8 +1314,8 @@ struct PresenceOptionDataBuilder {
|
|||
void add_data(flatbuffers::Offset<flatbuffers::Vector<u8>> data) {
|
||||
fbb_.AddOffset(PresenceOptionData::VT_DATA, data);
|
||||
}
|
||||
void add_len(uint32_t len) {
|
||||
fbb_.AddElement<uint32_t>(PresenceOptionData::VT_LEN, len, 0);
|
||||
void add_len(u32 len) {
|
||||
fbb_.AddElement<u32>(PresenceOptionData::VT_LEN, len, 0);
|
||||
}
|
||||
explicit PresenceOptionDataBuilder(flatbuffers::FlatBufferBuilder &_fbb)
|
||||
: fbb_(_fbb) {
|
||||
|
|
@ -1332,7 +1332,7 @@ struct PresenceOptionDataBuilder {
|
|||
inline flatbuffers::Offset<PresenceOptionData> CreatePresenceOptionData(
|
||||
flatbuffers::FlatBufferBuilder &_fbb,
|
||||
flatbuffers::Offset<flatbuffers::Vector<u8>> 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<PresenceOptionData> CreatePresenceOptionData(
|
|||
inline flatbuffers::Offset<PresenceOptionData> CreatePresenceOptionDataDirect(
|
||||
flatbuffers::FlatBufferBuilder &_fbb,
|
||||
const std::vector<u8> *data = nullptr,
|
||||
uint32_t len = 0) {
|
||||
u32 len = 0) {
|
||||
auto data__ = data ? _fbb.CreateVector<u8>(*data) : 0;
|
||||
return CreatePresenceOptionData(
|
||||
_fbb,
|
||||
|
|
@ -1428,23 +1428,23 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
s32 option() const {
|
||||
return GetField<s32>(VT_OPTION, 0);
|
||||
}
|
||||
uint32_t worldId() const {
|
||||
return GetField<uint32_t>(VT_WORLDID, 0);
|
||||
u32 worldId() const {
|
||||
return GetField<u32>(VT_WORLDID, 0);
|
||||
}
|
||||
uint64_t lobbyId() const {
|
||||
return GetField<uint64_t>(VT_LOBBYID, 0);
|
||||
}
|
||||
uint32_t rangeFilter_startIndex() const {
|
||||
return GetField<uint32_t>(VT_RANGEFILTER_STARTINDEX, 0);
|
||||
u32 rangeFilter_startIndex() const {
|
||||
return GetField<u32>(VT_RANGEFILTER_STARTINDEX, 0);
|
||||
}
|
||||
uint32_t rangeFilter_max() const {
|
||||
return GetField<uint32_t>(VT_RANGEFILTER_MAX, 0);
|
||||
u32 rangeFilter_max() const {
|
||||
return GetField<u32>(VT_RANGEFILTER_MAX, 0);
|
||||
}
|
||||
uint32_t flagFilter() const {
|
||||
return GetField<uint32_t>(VT_FLAGFILTER, 0);
|
||||
u32 flagFilter() const {
|
||||
return GetField<u32>(VT_FLAGFILTER, 0);
|
||||
}
|
||||
uint32_t flagAttr() const {
|
||||
return GetField<uint32_t>(VT_FLAGATTR, 0);
|
||||
u32 flagAttr() const {
|
||||
return GetField<u32>(VT_FLAGATTR, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>> *intFilter() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>> *>(VT_INTFILTER);
|
||||
|
|
@ -1458,12 +1458,12 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
|||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<s32>(verifier, VT_OPTION) &&
|
||||
VerifyField<uint32_t>(verifier, VT_WORLDID) &&
|
||||
VerifyField<u32>(verifier, VT_WORLDID) &&
|
||||
VerifyField<uint64_t>(verifier, VT_LOBBYID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_RANGEFILTER_STARTINDEX) &&
|
||||
VerifyField<uint32_t>(verifier, VT_RANGEFILTER_MAX) &&
|
||||
VerifyField<uint32_t>(verifier, VT_FLAGFILTER) &&
|
||||
VerifyField<uint32_t>(verifier, VT_FLAGATTR) &&
|
||||
VerifyField<u32>(verifier, VT_RANGEFILTER_STARTINDEX) &&
|
||||
VerifyField<u32>(verifier, VT_RANGEFILTER_MAX) &&
|
||||
VerifyField<u32>(verifier, VT_FLAGFILTER) &&
|
||||
VerifyField<u32>(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<s32>(SearchRoomRequest::VT_OPTION, option, 0);
|
||||
}
|
||||
void add_worldId(uint32_t worldId) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_WORLDID, worldId, 0);
|
||||
void add_worldId(u32 worldId) {
|
||||
fbb_.AddElement<u32>(SearchRoomRequest::VT_WORLDID, worldId, 0);
|
||||
}
|
||||
void add_lobbyId(uint64_t lobbyId) {
|
||||
fbb_.AddElement<uint64_t>(SearchRoomRequest::VT_LOBBYID, lobbyId, 0);
|
||||
}
|
||||
void add_rangeFilter_startIndex(uint32_t rangeFilter_startIndex) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_RANGEFILTER_STARTINDEX, rangeFilter_startIndex, 0);
|
||||
void add_rangeFilter_startIndex(u32 rangeFilter_startIndex) {
|
||||
fbb_.AddElement<u32>(SearchRoomRequest::VT_RANGEFILTER_STARTINDEX, rangeFilter_startIndex, 0);
|
||||
}
|
||||
void add_rangeFilter_max(uint32_t rangeFilter_max) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_RANGEFILTER_MAX, rangeFilter_max, 0);
|
||||
void add_rangeFilter_max(u32 rangeFilter_max) {
|
||||
fbb_.AddElement<u32>(SearchRoomRequest::VT_RANGEFILTER_MAX, rangeFilter_max, 0);
|
||||
}
|
||||
void add_flagFilter(uint32_t flagFilter) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_FLAGFILTER, flagFilter, 0);
|
||||
void add_flagFilter(u32 flagFilter) {
|
||||
fbb_.AddElement<u32>(SearchRoomRequest::VT_FLAGFILTER, flagFilter, 0);
|
||||
}
|
||||
void add_flagAttr(uint32_t flagAttr) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0);
|
||||
void add_flagAttr(u32 flagAttr) {
|
||||
fbb_.AddElement<u32>(SearchRoomRequest::VT_FLAGATTR, flagAttr, 0);
|
||||
}
|
||||
void add_intFilter(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>>> intFilter) {
|
||||
fbb_.AddOffset(SearchRoomRequest::VT_INTFILTER, intFilter);
|
||||
|
|
@ -1524,12 +1524,12 @@ struct SearchRoomRequestBuilder {
|
|||
inline flatbuffers::Offset<SearchRoomRequest> 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<flatbuffers::Vector<flatbuffers::Offset<IntSearchFilter>>> intFilter = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinSearchFilter>>> binFilter = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<u16>> attrId = 0) {
|
||||
|
|
@ -1550,12 +1550,12 @@ inline flatbuffers::Offset<SearchRoomRequest> CreateSearchRoomRequest(
|
|||
inline flatbuffers::Offset<SearchRoomRequest> 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<flatbuffers::Offset<IntSearchFilter>> *intFilter = nullptr,
|
||||
const std::vector<flatbuffers::Offset<BinSearchFilter>> *binFilter = nullptr,
|
||||
const std::vector<u16> *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<uint32_t>(VT_STARTINDEX, 0);
|
||||
u32 startIndex() const {
|
||||
return GetField<u32>(VT_STARTINDEX, 0);
|
||||
}
|
||||
uint32_t total() const {
|
||||
return GetField<uint32_t>(VT_TOTAL, 0);
|
||||
u32 total() const {
|
||||
return GetField<u32>(VT_TOTAL, 0);
|
||||
}
|
||||
uint32_t size() const {
|
||||
return GetField<uint32_t>(VT_SIZE, 0);
|
||||
u32 size() const {
|
||||
return GetField<u32>(VT_SIZE, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>> *rooms() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>> *>(VT_ROOMS);
|
||||
}
|
||||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<uint32_t>(verifier, VT_STARTINDEX) &&
|
||||
VerifyField<uint32_t>(verifier, VT_TOTAL) &&
|
||||
VerifyField<uint32_t>(verifier, VT_SIZE) &&
|
||||
VerifyField<u32>(verifier, VT_STARTINDEX) &&
|
||||
VerifyField<u32>(verifier, VT_TOTAL) &&
|
||||
VerifyField<u32>(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<uint32_t>(SearchRoomResponse::VT_STARTINDEX, startIndex, 0);
|
||||
void add_startIndex(u32 startIndex) {
|
||||
fbb_.AddElement<u32>(SearchRoomResponse::VT_STARTINDEX, startIndex, 0);
|
||||
}
|
||||
void add_total(uint32_t total) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomResponse::VT_TOTAL, total, 0);
|
||||
void add_total(u32 total) {
|
||||
fbb_.AddElement<u32>(SearchRoomResponse::VT_TOTAL, total, 0);
|
||||
}
|
||||
void add_size(uint32_t size) {
|
||||
fbb_.AddElement<uint32_t>(SearchRoomResponse::VT_SIZE, size, 0);
|
||||
void add_size(u32 size) {
|
||||
fbb_.AddElement<u32>(SearchRoomResponse::VT_SIZE, size, 0);
|
||||
}
|
||||
void add_rooms(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>>> rooms) {
|
||||
fbb_.AddOffset(SearchRoomResponse::VT_ROOMS, rooms);
|
||||
|
|
@ -1636,9 +1636,9 @@ struct SearchRoomResponseBuilder {
|
|||
|
||||
inline flatbuffers::Offset<SearchRoomResponse> 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<flatbuffers::Vector<flatbuffers::Offset<RoomDataExternal>>> rooms = 0) {
|
||||
SearchRoomResponseBuilder builder_(_fbb);
|
||||
builder_.add_rooms(rooms);
|
||||
|
|
@ -1650,9 +1650,9 @@ inline flatbuffers::Offset<SearchRoomResponse> CreateSearchRoomResponse(
|
|||
|
||||
inline flatbuffers::Offset<SearchRoomResponse> 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<flatbuffers::Offset<RoomDataExternal>> *rooms = nullptr) {
|
||||
auto rooms__ = rooms ? _fbb.CreateVector<flatbuffers::Offset<RoomDataExternal>>(*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<uint32_t>(VT_WORLDID, 0);
|
||||
u32 worldId() const {
|
||||
return GetField<u32>(VT_WORLDID, 0);
|
||||
}
|
||||
uint64_t lobbyId() const {
|
||||
return GetField<uint64_t>(VT_LOBBYID, 0);
|
||||
}
|
||||
uint32_t maxSlot() const {
|
||||
return GetField<uint32_t>(VT_MAXSLOT, 0);
|
||||
u32 maxSlot() const {
|
||||
return GetField<u32>(VT_MAXSLOT, 0);
|
||||
}
|
||||
uint32_t flagAttr() const {
|
||||
return GetField<uint32_t>(VT_FLAGATTR, 0);
|
||||
u32 flagAttr() const {
|
||||
return GetField<u32>(VT_FLAGATTR, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTRINTERNAL);
|
||||
|
|
@ -1736,10 +1736,10 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
|
|||
}
|
||||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<uint32_t>(verifier, VT_WORLDID) &&
|
||||
VerifyField<u32>(verifier, VT_WORLDID) &&
|
||||
VerifyField<uint64_t>(verifier, VT_LOBBYID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_MAXSLOT) &&
|
||||
VerifyField<uint32_t>(verifier, VT_FLAGATTR) &&
|
||||
VerifyField<u32>(verifier, VT_MAXSLOT) &&
|
||||
VerifyField<u32>(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<uint32_t>(CreateJoinRoomRequest::VT_WORLDID, worldId, 0);
|
||||
void add_worldId(u32 worldId) {
|
||||
fbb_.AddElement<u32>(CreateJoinRoomRequest::VT_WORLDID, worldId, 0);
|
||||
}
|
||||
void add_lobbyId(uint64_t lobbyId) {
|
||||
fbb_.AddElement<uint64_t>(CreateJoinRoomRequest::VT_LOBBYID, lobbyId, 0);
|
||||
}
|
||||
void add_maxSlot(uint32_t maxSlot) {
|
||||
fbb_.AddElement<uint32_t>(CreateJoinRoomRequest::VT_MAXSLOT, maxSlot, 0);
|
||||
void add_maxSlot(u32 maxSlot) {
|
||||
fbb_.AddElement<u32>(CreateJoinRoomRequest::VT_MAXSLOT, maxSlot, 0);
|
||||
}
|
||||
void add_flagAttr(uint32_t flagAttr) {
|
||||
fbb_.AddElement<uint32_t>(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0);
|
||||
void add_flagAttr(u32 flagAttr) {
|
||||
fbb_.AddElement<u32>(CreateJoinRoomRequest::VT_FLAGATTR, flagAttr, 0);
|
||||
}
|
||||
void add_roomBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal) {
|
||||
fbb_.AddOffset(CreateJoinRoomRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal);
|
||||
|
|
@ -1844,10 +1844,10 @@ struct CreateJoinRoomRequestBuilder {
|
|||
|
||||
inline flatbuffers::Offset<CreateJoinRoomRequest> 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<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<IntAttr>>> roomSearchableIntAttrExternal = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomSearchableBinAttrExternal = 0,
|
||||
|
|
@ -1884,10 +1884,10 @@ inline flatbuffers::Offset<CreateJoinRoomRequest> CreateCreateJoinRoomRequest(
|
|||
|
||||
inline flatbuffers::Offset<CreateJoinRoomRequest> 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<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
|
||||
const std::vector<flatbuffers::Offset<IntAttr>> *roomSearchableIntAttrExternal = nullptr,
|
||||
const std::vector<flatbuffers::Offset<BinAttr>> *roomSearchableBinAttrExternal = nullptr,
|
||||
|
|
@ -2205,11 +2205,11 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers:
|
|||
uint64_t roomId() const {
|
||||
return GetField<uint64_t>(VT_ROOMID, 0);
|
||||
}
|
||||
uint32_t flagFilter() const {
|
||||
return GetField<uint32_t>(VT_FLAGFILTER, 0);
|
||||
u32 flagFilter() const {
|
||||
return GetField<u32>(VT_FLAGFILTER, 0);
|
||||
}
|
||||
uint32_t flagAttr() const {
|
||||
return GetField<uint32_t>(VT_FLAGATTR, 0);
|
||||
u32 flagAttr() const {
|
||||
return GetField<u32>(VT_FLAGATTR, 0);
|
||||
}
|
||||
const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<BinAttr>> *>(VT_ROOMBINATTRINTERNAL);
|
||||
|
|
@ -2226,8 +2226,8 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers:
|
|||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<uint64_t>(verifier, VT_ROOMID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_FLAGFILTER) &&
|
||||
VerifyField<uint32_t>(verifier, VT_FLAGATTR) &&
|
||||
VerifyField<u32>(verifier, VT_FLAGFILTER) &&
|
||||
VerifyField<u32>(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<uint64_t>(SetRoomDataInternalRequest::VT_ROOMID, roomId, 0);
|
||||
}
|
||||
void add_flagFilter(uint32_t flagFilter) {
|
||||
fbb_.AddElement<uint32_t>(SetRoomDataInternalRequest::VT_FLAGFILTER, flagFilter, 0);
|
||||
void add_flagFilter(u32 flagFilter) {
|
||||
fbb_.AddElement<u32>(SetRoomDataInternalRequest::VT_FLAGFILTER, flagFilter, 0);
|
||||
}
|
||||
void add_flagAttr(uint32_t flagAttr) {
|
||||
fbb_.AddElement<uint32_t>(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0);
|
||||
void add_flagAttr(u32 flagAttr) {
|
||||
fbb_.AddElement<u32>(SetRoomDataInternalRequest::VT_FLAGATTR, flagAttr, 0);
|
||||
}
|
||||
void add_roomBinAttrInternal(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal) {
|
||||
fbb_.AddOffset(SetRoomDataInternalRequest::VT_ROOMBINATTRINTERNAL, roomBinAttrInternal);
|
||||
|
|
@ -2280,8 +2280,8 @@ struct SetRoomDataInternalRequestBuilder {
|
|||
inline flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataInternalRequest(
|
||||
flatbuffers::FlatBufferBuilder &_fbb,
|
||||
uint64_t roomId = 0,
|
||||
uint32_t flagFilter = 0,
|
||||
uint32_t flagAttr = 0,
|
||||
u32 flagFilter = 0,
|
||||
u32 flagAttr = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<BinAttr>>> roomBinAttrInternal = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<RoomGroupPasswordConfig>>> passwordConfig = 0,
|
||||
uint64_t passwordSlotMask = 0,
|
||||
|
|
@ -2300,8 +2300,8 @@ inline flatbuffers::Offset<SetRoomDataInternalRequest> CreateSetRoomDataInternal
|
|||
inline flatbuffers::Offset<SetRoomDataInternalRequest> 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<flatbuffers::Offset<BinAttr>> *roomBinAttrInternal = nullptr,
|
||||
const std::vector<flatbuffers::Offset<RoomGroupPasswordConfig>> *passwordConfig = nullptr,
|
||||
uint64_t passwordSlotMask = 0,
|
||||
|
|
@ -2515,21 +2515,21 @@ struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
|
|||
u16 serverId() const {
|
||||
return GetField<u16>(VT_SERVERID, 0);
|
||||
}
|
||||
uint32_t worldId() const {
|
||||
return GetField<uint32_t>(VT_WORLDID, 0);
|
||||
u32 worldId() const {
|
||||
return GetField<u32>(VT_WORLDID, 0);
|
||||
}
|
||||
uint64_t roomId() const {
|
||||
return GetField<uint64_t>(VT_ROOMID, 0);
|
||||
}
|
||||
uint32_t rtt() const {
|
||||
return GetField<uint32_t>(VT_RTT, 0);
|
||||
u32 rtt() const {
|
||||
return GetField<u32>(VT_RTT, 0);
|
||||
}
|
||||
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<u16>(verifier, VT_SERVERID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_WORLDID) &&
|
||||
VerifyField<u32>(verifier, VT_WORLDID) &&
|
||||
VerifyField<uint64_t>(verifier, VT_ROOMID) &&
|
||||
VerifyField<uint32_t>(verifier, VT_RTT) &&
|
||||
VerifyField<u32>(verifier, VT_RTT) &&
|
||||
verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
|
@ -2540,14 +2540,14 @@ struct GetPingInfoResponseBuilder {
|
|||
void add_serverId(u16 serverId) {
|
||||
fbb_.AddElement<u16>(GetPingInfoResponse::VT_SERVERID, serverId, 0);
|
||||
}
|
||||
void add_worldId(uint32_t worldId) {
|
||||
fbb_.AddElement<uint32_t>(GetPingInfoResponse::VT_WORLDID, worldId, 0);
|
||||
void add_worldId(u32 worldId) {
|
||||
fbb_.AddElement<u32>(GetPingInfoResponse::VT_WORLDID, worldId, 0);
|
||||
}
|
||||
void add_roomId(uint64_t roomId) {
|
||||
fbb_.AddElement<uint64_t>(GetPingInfoResponse::VT_ROOMID, roomId, 0);
|
||||
}
|
||||
void add_rtt(uint32_t rtt) {
|
||||
fbb_.AddElement<uint32_t>(GetPingInfoResponse::VT_RTT, rtt, 0);
|
||||
void add_rtt(u32 rtt) {
|
||||
fbb_.AddElement<u32>(GetPingInfoResponse::VT_RTT, rtt, 0);
|
||||
}
|
||||
explicit GetPingInfoResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb)
|
||||
: fbb_(_fbb) {
|
||||
|
|
@ -2564,9 +2564,9 @@ struct GetPingInfoResponseBuilder {
|
|||
inline flatbuffers::Offset<GetPingInfoResponse> 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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ namespace vk
|
|||
{
|
||||
bindings.push_back
|
||||
({
|
||||
uint32_t(bindings.size()),
|
||||
u32(bindings.size()),
|
||||
e.first,
|
||||
1,
|
||||
VK_SHADER_STAGE_COMPUTE_BIT,
|
||||
|
|
|
|||
|
|
@ -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<uint32_t>(bindings.size());
|
||||
infos.bindingCount = static_cast<u32>(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<uint32_t>(sizes.size()), DESCRIPTOR_MAX_DRAW_CALLS, 1);
|
||||
ctx.descriptor_pool.create(*m_device, sizes.data(), static_cast<u32>(sizes.size()), DESCRIPTOR_MAX_DRAW_CALLS, 1);
|
||||
}
|
||||
|
||||
const auto& memory_map = m_device->get_memory_mapping();
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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<VkComponentSwizzle, 4>& base_remap, const std::pair<std::array<u8, 4>, std::array<u8, 4>>& 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<uint32_t, chip_class> lut;
|
||||
std::unordered_map<u32, chip_class> 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<vk::memory_block> 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<vk::memory_block> 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<buffer> 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<uint32_t*>(m_buffer->map(0, 4));
|
||||
m_value = reinterpret_cast<u32*>(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<uint32_t>(image_view_array.size());
|
||||
info.attachmentCount = static_cast<u32>(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<T> 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<PFN_vkCreateSwapchainKHR>(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<VkPresentModeKHR> present_modes(nb_available_modes);
|
||||
|
|
@ -2759,7 +2759,7 @@ public:
|
|||
|
||||
rsx_log.notice("Swapchain: present mode %d in use.", static_cast<int>(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<uint32_t>(layers.size());
|
||||
instance_info.enabledLayerCount = static_cast<u32>(layers.size());
|
||||
instance_info.ppEnabledLayerNames = layers.data();
|
||||
instance_info.enabledExtensionCount = fast ? 0 : static_cast<uint32_t>(extensions.size());
|
||||
instance_info.enabledExtensionCount = fast ? 0 : static_cast<u32>(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<physical_device>& 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<VkBool32> 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<VkSurfaceFormatKHR> 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);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ namespace vk
|
|||
|
||||
VkRenderPassCreateInfo rp_info = {};
|
||||
rp_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
|
||||
rp_info.attachmentCount = static_cast<uint32_t>(attachments.size());
|
||||
rp_info.attachmentCount = static_cast<u32>(attachments.size());
|
||||
rp_info.pAttachments = attachments.data();
|
||||
rp_info.subpassCount = 1;
|
||||
rp_info.pSubpasses = &subpass;
|
||||
|
|
|
|||
|
|
@ -652,7 +652,7 @@ namespace rsx
|
|||
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT,
|
||||
VK_IMAGE_TYPE_2D,
|
||||
requested_format,
|
||||
static_cast<uint32_t>(width_), static_cast<uint32_t>(height_), 1, 1, 1,
|
||||
static_cast<u32>(width_), static_cast<u32>(height_), 1, 1, 1,
|
||||
static_cast<VkSampleCountFlagBits>(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<uint32_t>(width_), static_cast<uint32_t>(height_), 1, 1, 1,
|
||||
static_cast<u32>(width_), static_cast<u32>(height_), 1, 1, 1,
|
||||
static_cast<VkSampleCountFlagBits>(samples),
|
||||
VK_IMAGE_LAYOUT_UNDEFINED,
|
||||
VK_IMAGE_TILING_OPTIMAL,
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ namespace vk
|
|||
const auto& binding_table = vk::get_current_renderer()->get_pipeline_binding_table();
|
||||
std::vector<VkDescriptorSetLayoutBinding> 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<uint32_t>(bindings.size());
|
||||
infos.bindingCount = static_cast<u32>(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<VkDescriptorImageInfo, 68>& 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<VkDescriptorImageInfo, 68>& sampled_images, VkDescriptorSet descriptor_set);
|
||||
VkDescriptorSet allocate_descriptor_set();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1121,7 +1121,7 @@ namespace
|
|||
template <typename T, T... Index>
|
||||
auto create_printing_table(std::integer_sequence<T, Index...> seq)
|
||||
{
|
||||
std::unordered_map<uint32_t, std::string (*)(u32)> result;
|
||||
std::unordered_map<u32, std::string (*)(u32)> result;
|
||||
(result.insert({
|
||||
{opcode_list[Index * 5 + 0], ®ister_pretty_printing<opcode_list[Index * 5 + 0]>},
|
||||
{opcode_list[Index * 5 + 1], ®ister_pretty_printing<opcode_list[Index * 5 + 1]>},
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ namespace rsx
|
|||
std::string to_string(shading_mode op);
|
||||
std::string to_string(polygon_mode op);
|
||||
|
||||
template<uint32_t Register>
|
||||
template<u32 Register>
|
||||
struct registers_decoder
|
||||
{};
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
#include <QString>
|
||||
#include <QObject>
|
||||
|
||||
#include "util/types.hpp"
|
||||
|
||||
typedef std::map<const QString, const QString> 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<uint32_t, QString> level
|
||||
const std::map<u32, QString> 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<uint32_t, QString> mode
|
||||
const std::map<u32, QString> mode
|
||||
{
|
||||
{ 1 << 0, tr("480p") },
|
||||
{ 1 << 1, tr("576p") },
|
||||
|
|
@ -125,7 +127,7 @@ public:
|
|||
|
||||
const struct sound
|
||||
{
|
||||
const std::map<uint32_t, QString> format
|
||||
const std::map<u32, QString> format
|
||||
{
|
||||
{ 1 << 0, tr("LPCM 2.0") },
|
||||
//{ 1 << 1, tr("LPCM ???") },
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue