diff options
author | Subv <subv2112@gmail.com> | 2015-02-01 21:31:21 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2015-02-12 15:25:35 +0100 |
commit | 8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (patch) | |
tree | 05f18714a93d28999c259f4cd86c261deaf659b2 /src/video_core | |
parent | Merge pull request #384 from neobrain/vertex_shader_debugger (diff) | |
download | yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.gz yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.bz2 yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.lz yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.xz yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.zst yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.zip |
Diffstat (limited to '')
-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 c2c898992..03641d93b 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 0bd52231b..80935a50a 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; |