diff options
| author |  Sean | 2014-10-29 19:12:39 -0400 |
|---|---|---|
| committer | Sean | 2014-10-29 20:26:15 -0400 |
| commit | 9a012ff007df4187c84c01f4e48545d19bd1f918 (patch) | |
| tree | 1eb367a264392ddf7422470a263b240ccacb4050 /src/video_core | |
| parent | Merge pull request #151 from archshift/dyncom-enabled (diff) | |
| download | yuzu-9a012ff007df4187c84c01f4e48545d19bd1f918.tar.gz yuzu-9a012ff007df4187c84c01f4e48545d19bd1f918.tar.xz yuzu-9a012ff007df4187c84c01f4e48545d19bd1f918.zip | |
Fix some warnings
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/clipper.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/command_processor.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp index 2cf166afd..96d3dabe2 100644 --- a/src/video_core/clipper.cpp +++ b/src/video_core/clipper.cpp | |||
| @@ -158,8 +158,8 @@ void ProcessTriangle(OutputVertex &v0, OutputVertex &v1, OutputVertex &v2) { | |||
| 158 | InitScreenCoordinates(vtx2); | 158 | InitScreenCoordinates(vtx2); |
| 159 | 159 | ||
| 160 | DEBUG_LOG(GPU, | 160 | DEBUG_LOG(GPU, |
| 161 | "Triangle %u/%u (%u buffer vertices) at position (%.3f, %.3f, %.3f, %.3f), " | 161 | "Triangle %lu/%lu (%lu buffer vertices) at position (%.3f, %.3f, %.3f, %.3f), " |
| 162 | "(%.3f, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f) and " | 162 | "(%.3lu, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f) and " |
| 163 | "screen position (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f)", | 163 | "screen position (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f)", |
| 164 | i,output_list.size(), buffer_vertices.size(), | 164 | i,output_list.size(), buffer_vertices.size(), |
| 165 | vtx0.pos.x.ToFloat32(), vtx0.pos.y.ToFloat32(), vtx0.pos.z.ToFloat32(), vtx0.pos.w.ToFloat32(),output_list.size(), | 165 | vtx0.pos.x.ToFloat32(), vtx0.pos.y.ToFloat32(), vtx0.pos.z.ToFloat32(), vtx0.pos.w.ToFloat32(),output_list.size(), |
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index a9510fa2e..1ec727698 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -102,7 +102,7 @@ static inline void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 102 | (vertex_attribute_formats[i] == 2) ? *(s16*)srcdata : | 102 | (vertex_attribute_formats[i] == 2) ? *(s16*)srcdata : |
| 103 | *(float*)srcdata; | 103 | *(float*)srcdata; |
| 104 | input.attr[i][comp] = float24::FromFloat32(srcval); | 104 | input.attr[i][comp] = float24::FromFloat32(srcval); |
| 105 | DEBUG_LOG(GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08x + 0x%04x: %f", | 105 | DEBUG_LOG(GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08lx + 0x%04lx: %f", |
| 106 | comp, i, vertex, index, | 106 | comp, i, vertex, index, |
| 107 | attribute_config.GetBaseAddress(), | 107 | attribute_config.GetBaseAddress(), |
| 108 | vertex_attribute_sources[i] - base_address, | 108 | vertex_attribute_sources[i] - base_address, |