diff options
author | bunnei <bunneidev@gmail.com> | 2014-10-08 23:06:28 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-10-08 23:06:28 -0400 |
commit | 8fb064cd62d3091b88bb2660a0264997f5cb163d (patch) | |
tree | a7f2983c43d910b15fe42396e074f5b26cab5ff8 /src/video_core/clipper.cpp | |
parent | 8d1154c24e731795eae3ef5a565fbfed37290708 (diff) | |
parent | eb5054e6eb0d810f26caff9f09e43dbeee4a69fa (diff) |
Merge pull request #119 from lioncash/warn
Fix warnings in video_core
Diffstat (limited to 'src/video_core/clipper.cpp')
-rw-r--r-- | src/video_core/clipper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp index 592f2f476..2cf166afd 100644 --- a/src/video_core/clipper.cpp +++ b/src/video_core/clipper.cpp @@ -86,8 +86,8 @@ static void InitScreenCoordinates(OutputVertex& vtx) viewport.halfsize_x = float24::FromRawFloat24(registers.viewport_size_x); viewport.halfsize_y = float24::FromRawFloat24(registers.viewport_size_y); - viewport.offset_x = float24::FromFloat32(registers.viewport_corner.x); - viewport.offset_y = float24::FromFloat32(registers.viewport_corner.y); + viewport.offset_x = float24::FromFloat32(static_cast<float>(registers.viewport_corner.x)); + viewport.offset_y = float24::FromFloat32(static_cast<float>(registers.viewport_corner.y)); viewport.zscale = float24::FromRawFloat24(registers.viewport_depth_range); viewport.offset_z = float24::FromRawFloat24(registers.viewport_depth_far_plane); @@ -150,7 +150,7 @@ void ProcessTriangle(OutputVertex &v0, OutputVertex &v1, OutputVertex &v2) { InitScreenCoordinates(*(output_list[0])); InitScreenCoordinates(*(output_list[1])); - for (int i = 0; i < output_list.size() - 2; i ++) { + for (size_t i = 0; i < output_list.size() - 2; i ++) { OutputVertex& vtx0 = *(output_list[0]); OutputVertex& vtx1 = *(output_list[i+1]); OutputVertex& vtx2 = *(output_list[i+2]); @@ -158,7 +158,7 @@ void ProcessTriangle(OutputVertex &v0, OutputVertex &v1, OutputVertex &v2) { InitScreenCoordinates(vtx2); DEBUG_LOG(GPU, - "Triangle %d/%d (%d buffer vertices) at position (%.3f, %.3f, %.3f, %.3f), " + "Triangle %u/%u (%u buffer vertices) at position (%.3f, %.3f, %.3f, %.3f), " "(%.3f, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f) and " "screen position (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f), (%.2f, %.2f, %.2f)", i,output_list.size(), buffer_vertices.size(), |