diff options
| author | bunnei <bunneidev@gmail.com> | 2016-03-17 15:29:40 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-03-17 15:29:40 +0100 |
| commit | 20ba5b14b40f716d297cfed6c83d24719391bbfa (patch) | |
| tree | 4819132ccb06922c4e2a7dc431736a1c4dd292a0 /src/video_core/command_processor.cpp | |
| parent | Merge pull request #1466 from LittleWhite-tb/gamelist-update-recent (diff) | |
| parent | video_core: Don't cast away const (diff) | |
| download | yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.tar yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.tar.gz yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.tar.bz2 yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.tar.lz yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.tar.xz yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.tar.zst yuzu-20ba5b14b40f716d297cfed6c83d24719391bbfa.zip | |
Diffstat (limited to 'src/video_core/command_processor.cpp')
| -rw-r--r-- | src/video_core/command_processor.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 54721561e..33414258a 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -234,7 +234,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { const auto& index_info = regs.index_array; const u8* index_address_8 = Memory::GetPhysicalPointer(base_address + index_info.offset); - const u16* index_address_16 = (u16*)index_address_8; + const u16* index_address_16 = reinterpret_cast<const u16*>(index_address_8); bool index_u16 = index_info.format != 0; #if PICA_DUMP_GEOMETRY @@ -345,10 +345,11 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { : (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? 2 : 1); } - const float srcval = (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::BYTE) ? *(s8*)srcdata : - (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::UBYTE) ? *(u8*)srcdata : - (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? *(s16*)srcdata : - *(float*)srcdata; + const float srcval = + (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::BYTE) ? *reinterpret_cast<const s8*>(srcdata) : + (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::UBYTE) ? *reinterpret_cast<const u8*>(srcdata) : + (vertex_attribute_formats[i] == Regs::VertexAttributeFormat::SHORT) ? *reinterpret_cast<const s16*>(srcdata) : + *reinterpret_cast<const float*>(srcdata); input.attr[i][comp] = float24::FromFloat32(srcval); LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08x + 0x%04x: %f", |