diff options
author | Huw Pascoe <huw.pascoe@gmail.com> | 2017-09-27 01:26:09 +0200 |
---|---|---|
committer | Huw Pascoe <huw.pascoe@gmail.com> | 2017-09-30 10:34:35 +0200 |
commit | a13ab958cbba75bc9abd1ca50f3030a10a75784e (patch) | |
tree | 016f6866d15fb9a41a15666f492bed352d95b523 /src/video_core | |
parent | Merge pull request #2961 from Subv/load_titles (diff) | |
download | yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.gz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.bz2 yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.lz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.xz yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.zst yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/geometry_pipeline.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_state.cpp | 4 |
2 files changed, 3 insertions, 3 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: DEBUG_ASSERT(need_index); // The number of vertex input is put to the uniform register - float24 vertex_num = float24::FromFloat32(val); + float24 vertex_num = float24::FromFloat32(static_cast<float>(val)); setup.uniforms.f[0] = Math::MakeVec(vertex_num, vertex_num, vertex_num, vertex_num); // The second uniform register and so on are used for receiving input vertices diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp index 06a905766..5770ae08f 100644 --- a/src/video_core/renderer_opengl/gl_state.cpp +++ b/src/video_core/renderer_opengl/gl_state.cpp @@ -267,9 +267,9 @@ void OpenGLState::Apply() const { for (size_t i = 0; i < clip_distance.size(); ++i) { if (clip_distance[i] != cur_state.clip_distance[i]) { if (clip_distance[i]) { - glEnable(GL_CLIP_DISTANCE0 + i); + glEnable(GL_CLIP_DISTANCE0 + static_cast<GLenum>(i)); } else { - glDisable(GL_CLIP_DISTANCE0 + i); + glDisable(GL_CLIP_DISTANCE0 + static_cast<GLenum>(i)); } } } |