diff options
author | bunnei <bunneidev@gmail.com> | 2015-02-14 15:50:26 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-02-14 15:50:26 -0500 |
commit | 12181c8a64678e73281e893b6ba108d5a125c1aa (patch) | |
tree | 831883189eb5c846b619c20e22e1015c5c140c63 /src/video_core | |
parent | 29a9e4ac25504bee82f273184a1afcc88a3e61e1 (diff) | |
parent | 8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (diff) |
Merge pull request #529 from Subv/master
Build: Fixed some warnings
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/gpu_debugger.h | 2 | ||||
-rw-r--r-- | src/video_core/vertex_shader.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h index c2c89899..03641d93 100644 --- a/src/video_core/gpu_debugger.h +++ b/src/video_core/gpu_debugger.h @@ -64,7 +64,7 @@ public: memcpy(&cmd, command_data, sizeof(GSP_GPU::Command)); ForEachObserver([this](DebuggerObserver* observer) { - observer->GXCommandProcessed(this->gx_command_history.size()); + observer->GXCommandProcessed(static_cast<int>(this->gx_command_history.size())); } ); } diff --git a/src/video_core/vertex_shader.cpp b/src/video_core/vertex_shader.cpp index 0bd52231..80935a50 100644 --- a/src/video_core/vertex_shader.cpp +++ b/src/video_core/vertex_shader.cpp @@ -252,7 +252,7 @@ static void ProcessShaderCode(VertexShaderState& state) { // TODO: Be stable against division by zero! // TODO: I think this might be wrong... we should only use one component here - dest[i] = float24::FromFloat32(1.0 / src1[i].ToFloat32()); + dest[i] = float24::FromFloat32(1.0f / src1[i].ToFloat32()); } break; @@ -267,7 +267,7 @@ static void ProcessShaderCode(VertexShaderState& state) { // TODO: Be stable against division by zero! // TODO: I think this might be wrong... we should only use one component here - dest[i] = float24::FromFloat32(1.0 / sqrt(src1[i].ToFloat32())); + dest[i] = float24::FromFloat32(1.0f / sqrt(src1[i].ToFloat32())); } break; |