diff options
| author |  Huw Pascoe | 2017-09-27 00:26:09 +0100 |
|---|---|---|
| committer | Huw Pascoe | 2017-09-30 09:34:35 +0100 |
| commit | a13ab958cbba75bc9abd1ca50f3030a10a75784e (patch) | |
| tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/video_core/geometry_pipeline.cpp | |
| parent | Merge pull request #2961 from Subv/load_titles (diff) | |
| download | yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.gz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.xz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.zip | |
Fixed type conversion ambiguity
Diffstat (limited to 'src/video_core/geometry_pipeline.cpp')
| -rw-r--r-- | src/video_core/geometry_pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/geometry_pipeline.cpp b/src/video_core/geometry_pipeline.cpp index b146e2ecb..98ff2ccd3 100644 --- a/src/video_core/geometry_pipeline.cpp +++ b/src/video_core/geometry_pipeline.cpp | |||
| @@ -105,7 +105,7 @@ public: | |||
| 105 | DEBUG_ASSERT(need_index); | 105 | DEBUG_ASSERT(need_index); |
| 106 | 106 | ||
| 107 | // The number of vertex input is put to the uniform register | 107 | // The number of vertex input is put to the uniform register |
| 108 | float24 vertex_num = float24::FromFloat32(val); | 108 | float24 vertex_num = float24::FromFloat32(static_cast<float>(val)); |
| 109 | setup.uniforms.f[0] = Math::MakeVec(vertex_num, vertex_num, vertex_num, vertex_num); | 109 | setup.uniforms.f[0] = Math::MakeVec(vertex_num, vertex_num, vertex_num, vertex_num); |
| 110 | 110 | ||
| 111 | // The second uniform register and so on are used for receiving input vertices | 111 | // The second uniform register and so on are used for receiving input vertices |