midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Video_Core : Fix Conversion Warnings

Browse Source
This commit is contained in:
zawata 2015-06-27 19:32:56 -07:00
parent 1be1ff23a9
commit 716120da3d
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/command_processor.cpp
View File

@ -103,7 +103,7 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) {
case PICA_REG_INDEX_WORKAROUND(command_buffer.trigger[0], 0x23c): case PICA_REG_INDEX_WORKAROUND(command_buffer.trigger[0], 0x23c):
case PICA_REG_INDEX_WORKAROUND(command_buffer.trigger[1], 0x23d): case PICA_REG_INDEX_WORKAROUND(command_buffer.trigger[1], 0x23d):
{ {
unsigned index = id - PICA_REG_INDEX(command_buffer.trigger[0]); unsigned index = static_cast<int>(id - PICA_REG_INDEX(command_buffer.trigger[0]));
u32* head_ptr = (u32*)Memory::GetPhysicalPointer(regs.command_buffer.GetPhysicalAddress(index)); u32* head_ptr = (u32*)Memory::GetPhysicalPointer(regs.command_buffer.GetPhysicalAddress(index));
g_state.cmd_list.head_ptr = g_state.cmd_list.current_ptr = head_ptr; g_state.cmd_list.head_ptr = g_state.cmd_list.current_ptr = head_ptr;
g_state.cmd_list.length = regs.command_buffer.GetSize(index) / sizeof(u32); g_state.cmd_list.length = regs.command_buffer.GetSize(index) / sizeof(u32);

17
src/video_core/debug_utils/debug_utils.cpp
View File

@ -85,7 +85,6 @@ void GeometryDumper::AddTriangle(Vertex& v0, Vertex& v1, Vertex& v2) {
vertices.push_back(v1); vertices.push_back(v1);
vertices.push_back(v2); vertices.push_back(v2);
int num_vertices = vertices.size();
faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 }); faces.push_back({ num_vertices-3, num_vertices-2, num_vertices-1 });
} }
@ -241,8 +240,6 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data
dvle.main_offset_words = main_offset; dvle.main_offset_words = main_offset;
dvle.output_register_table_offset = write_offset - dvlb.dvle_offset; dvle.output_register_table_offset = write_offset - dvlb.dvle_offset;
dvle.output_register_table_size = output_info_table.size();
QueueForWriting((u8*)output_info_table.data(), output_info_table.size() * sizeof(OutputRegisterInfo));
// TODO: Create a label table for "main" // TODO: Create a label table for "main"
@ -497,31 +494,19 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture
// Lookup base value // Lookup base value
Math::Vec3<int> ret; Math::Vec3<int> ret;
if (differential_mode) { if (differential_mode) {
ret.r() = differential.r; ret.r() = static_cast<int>(differential.r);
ret.g() = differential.g;
ret.b() = differential.b;
if (x >= 2) { if (x >= 2) {
ret.r() += differential.dr;
ret.g() += differential.dg;
ret.b() += differential.db;
} }
ret.r() = Color::Convert5To8(ret.r()); ret.r() = Color::Convert5To8(ret.r());
ret.g() = Color::Convert5To8(ret.g()); ret.g() = Color::Convert5To8(ret.g());
ret.b() = Color::Convert5To8(ret.b()); ret.b() = Color::Convert5To8(ret.b());
} else { } else {
if (x < 2) { if (x < 2) {
ret.r() = Color::Convert4To8(separate.r1);
ret.g() = Color::Convert4To8(separate.g1);
ret.b() = Color::Convert4To8(separate.b1);
} else { } else {
ret.r() = Color::Convert4To8(separate.r2);
ret.g() = Color::Convert4To8(separate.g2);
ret.b() = Color::Convert4To8(separate.b2);
} }
} }
// Add modifier // Add modifier
unsigned table_index = (x < 2) ? table_index_1.Value() : table_index_2.Value();
static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{ static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{
{ 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 }, { 2, 8 }, { 5, 17 }, { 9, 29 }, { 13, 42 },

2
src/video_core/vertex_shader.cpp
View File

@ -96,7 +96,7 @@ static void ProcessShaderCode(VertexShaderState& state) {
state.program_counter = &program_code[offset] - 1; // -1 to make sure when incrementing the PC we end up at the correct offset state.program_counter = &program_code[offset] - 1; // -1 to make sure when incrementing the PC we end up at the correct offset
state.call_stack.push({ offset + num_instructions, return_offset, repeat_count, loop_increment, offset }); state.call_stack.push({ offset + num_instructions, return_offset, repeat_count, loop_increment, offset });
}; };
u32 binary_offset = state.program_counter - program_code.data(); u32 binary_offset = static_cast<u32>(state.program_counter - program_code.data());
state.debug.max_offset = std::max<u32>(state.debug.max_offset, 1 + binary_offset); state.debug.max_offset = std::max<u32>(state.debug.max_offset, 1 + binary_offset);