mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 11:53:23 +02:00
maxwell_3d: Silence array bounds warnings
This commit is contained in:
parent
ad48259d7e
commit
80a673a27f
@ -179,22 +179,22 @@ void Maxwell3D::ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argume
|
|||||||
return ProcessMacroBind(argument);
|
return ProcessMacroBind(argument);
|
||||||
case MAXWELL3D_REG_INDEX(firmware[4]):
|
case MAXWELL3D_REG_INDEX(firmware[4]):
|
||||||
return ProcessFirmwareCall4();
|
return ProcessFirmwareCall4();
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[0]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data):
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[1]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 1:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[2]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 2:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[3]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 3:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[4]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 4:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[5]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 5:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[6]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 6:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[7]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 7:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[8]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 8:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[9]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 9:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[10]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 10:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[11]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 11:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[12]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 12:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[13]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 13:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[14]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 14:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[15]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 15:
|
||||||
return StartCBData(method);
|
return StartCBData(method);
|
||||||
case MAXWELL3D_REG_INDEX(cb_bind[0]):
|
case MAXWELL3D_REG_INDEX(cb_bind[0]):
|
||||||
return ProcessCBBind(0);
|
return ProcessCBBind(0);
|
||||||
@ -287,22 +287,22 @@ void Maxwell3D::CallMultiMethod(u32 method, const u32* base_start, u32 amount,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (method) {
|
switch (method) {
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[0]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data):
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[1]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 1:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[2]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 2:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[3]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 3:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[4]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 4:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[5]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 5:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[6]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 6:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[7]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 7:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[8]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 8:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[9]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 9:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[10]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 10:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[11]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 11:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[12]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 12:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[13]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 13:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[14]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 14:
|
||||||
case MAXWELL3D_REG_INDEX(const_buffer.cb_data[15]):
|
case MAXWELL3D_REG_INDEX(const_buffer.cb_data) + 15:
|
||||||
ProcessCBMultiData(method, base_start, amount);
|
ProcessCBMultiData(method, base_start, amount);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -592,7 +592,7 @@ void Maxwell3D::ProcessCBData(u32 value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Maxwell3D::StartCBData(u32 method) {
|
void Maxwell3D::StartCBData(u32 method) {
|
||||||
constexpr u32 first_cb_data = MAXWELL3D_REG_INDEX(const_buffer.cb_data[0]);
|
constexpr u32 first_cb_data = MAXWELL3D_REG_INDEX(const_buffer.cb_data);
|
||||||
cb_data_state.start_pos = regs.const_buffer.cb_pos;
|
cb_data_state.start_pos = regs.const_buffer.cb_pos;
|
||||||
cb_data_state.id = method - first_cb_data;
|
cb_data_state.id = method - first_cb_data;
|
||||||
cb_data_state.current = method;
|
cb_data_state.current = method;
|
||||||
@ -605,7 +605,7 @@ void Maxwell3D::ProcessCBMultiData(u32 method, const u32* start_base, u32 amount
|
|||||||
if (cb_data_state.current != null_cb_data) {
|
if (cb_data_state.current != null_cb_data) {
|
||||||
FinishCBData();
|
FinishCBData();
|
||||||
}
|
}
|
||||||
constexpr u32 first_cb_data = MAXWELL3D_REG_INDEX(const_buffer.cb_data[0]);
|
constexpr u32 first_cb_data = MAXWELL3D_REG_INDEX(const_buffer.cb_data);
|
||||||
cb_data_state.start_pos = regs.const_buffer.cb_pos;
|
cb_data_state.start_pos = regs.const_buffer.cb_pos;
|
||||||
cb_data_state.id = method - first_cb_data;
|
cb_data_state.id = method - first_cb_data;
|
||||||
cb_data_state.current = method;
|
cb_data_state.current = method;
|
||||||
|
@ -1337,7 +1337,7 @@ public:
|
|||||||
u32 cb_address_high;
|
u32 cb_address_high;
|
||||||
u32 cb_address_low;
|
u32 cb_address_low;
|
||||||
u32 cb_pos;
|
u32 cb_pos;
|
||||||
u32 cb_data[NumCBData];
|
std::array<u32, NumCBData> cb_data;
|
||||||
|
|
||||||
GPUVAddr BufferAddress() const {
|
GPUVAddr BufferAddress() const {
|
||||||
return static_cast<GPUVAddr>(
|
return static_cast<GPUVAddr>(
|
||||||
|
Loading…
Reference in New Issue
Block a user