summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-02-14 21:50:26 +0100
committerbunnei <bunneidev@gmail.com>2015-02-14 21:50:26 +0100
commit12181c8a64678e73281e893b6ba108d5a125c1aa (patch)
tree831883189eb5c846b619c20e22e1015c5c140c63 /src/video_core
parentMerge pull request #572 from lioncash/prototypes (diff)
parentBuild: Fixed some warnings (diff)
downloadyuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.gz
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.bz2
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.lz
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.xz
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.tar.zst
yuzu-12181c8a64678e73281e893b6ba108d5a125c1aa.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/gpu_debugger.h2
-rw-r--r--src/video_core/vertex_shader.cpp4
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;