diff options
Diffstat (limited to 'src/video_core')
| -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: | |||
| 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 |
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 { | |||
| 267 | for (size_t i = 0; i < clip_distance.size(); ++i) { | 267 | for (size_t i = 0; i < clip_distance.size(); ++i) { |
| 268 | if (clip_distance[i] != cur_state.clip_distance[i]) { | 268 | if (clip_distance[i] != cur_state.clip_distance[i]) { |
| 269 | if (clip_distance[i]) { | 269 | if (clip_distance[i]) { |
| 270 | glEnable(GL_CLIP_DISTANCE0 + i); | 270 | glEnable(GL_CLIP_DISTANCE0 + static_cast<GLenum>(i)); |
| 271 | } else { | 271 | } else { |
| 272 | glDisable(GL_CLIP_DISTANCE0 + i); | 272 | glDisable(GL_CLIP_DISTANCE0 + static_cast<GLenum>(i)); |
| 273 | } | 273 | } |
| 274 | } | 274 | } |
| 275 | } | 275 | } |