Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CI: fix recent build issues (#6148)

Browse source 
Co-authored-by: Vitor K <vitor-kiguchi@hotmail.com>
This commit is contained in:
liushuyu 2022-10-05 10:43:07 -06:00 • committed by GitHub
parent 7d18e36566
commit c6153bb32e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 36 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/regs_pipeline.h
View file

@ -77,9 +77,9 @@ struct PipelineRegs {
}
u32 GetElementSizeInBytes(std::size_t n) const {
return (GetFormat(n) == VertexAttributeFormat::FLOAT)
? 4
: (GetFormat(n) == VertexAttributeFormat::SHORT) ? 2 : 1;
return (GetFormat(n) == VertexAttributeFormat::FLOAT) ? 4
: (GetFormat(n) == VertexAttributeFormat::SHORT) ? 2
: 1;
}
u32 GetStride(std::size_t n) const {

6
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View file

@ -630,9 +630,9 @@ private:
std::string dest_reg =
(instr.mad.dest.Value() < 0x10)
? outputreg_getter(static_cast<u32>(instr.mad.dest.Value().GetIndex()))
: (instr.mad.dest.Value() < 0x20)
? "reg_tmp" + std::to_string(instr.mad.dest.Value().GetIndex())
: "";
: (instr.mad.dest.Value() < 0x20)
? "reg_tmp" + std::to_string(instr.mad.dest.Value().GetIndex())
: "";
if (sanitize_mul) {
SetDest(swizzle, dest_reg,

12
src/video_core/shader/shader_interpreter.cpp
View file

@ -174,9 +174,9 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData
float24* dest =
(instr.common.dest.Value() < 0x10)
? &state.registers.output[instr.common.dest.Value().GetIndex()][0]
: (instr.common.dest.Value() < 0x20)
? &state.registers.temporary[instr.common.dest.Value().GetIndex()][0]
: dummy_vec4_float24;
: (instr.common.dest.Value() < 0x20)
? &state.registers.temporary[instr.common.dest.Value().GetIndex()][0]
: dummy_vec4_float24;
debug_data.max_opdesc_id =
std::max<u32>(debug_data.max_opdesc_id, 1 + instr.common.operand_desc_id);
@ -517,9 +517,9 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData
float24* dest =
(instr.mad.dest.Value() < 0x10)
? &state.registers.output[instr.mad.dest.Value().GetIndex()][0]
: (instr.mad.dest.Value() < 0x20)
? &state.registers.temporary[instr.mad.dest.Value().GetIndex()][0]
: dummy_vec4_float24;
: (instr.mad.dest.Value() < 0x20)
? &state.registers.temporary[instr.mad.dest.Value().GetIndex()][0]
: dummy_vec4_float24;
Record<DebugDataRecord::SRC1>(debug_data, iteration, src1);
Record<DebugDataRecord::SRC2>(debug_data, iteration, src2);

8
src/video_core/vertex_loader.cpp
View file

@ -88,10 +88,10 @@ void VertexLoader::LoadVertex(u32 base_address, int index, int vertex,
vertex_attribute_elements[i] *
((vertex_attribute_formats[i] == PipelineRegs::VertexAttributeFormat::FLOAT)
? 4
: (vertex_attribute_formats[i] ==
PipelineRegs::VertexAttributeFormat::SHORT)
? 2
: 1));
: (vertex_attribute_formats[i] ==
PipelineRegs::VertexAttributeFormat::SHORT)
? 2
: 1));
}
switch (vertex_attribute_formats[i]) {