diff options
| author | bunnei <bunneidev@gmail.com> | 2018-06-20 16:46:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 16:46:14 -0400 |
| commit | c3e95086b66dfa4214892dcddb9fd6f865037c1e (patch) | |
| tree | 859f41acecbdcfcbdf19df80903a045d6e2b0bcb /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
| parent | be1f5dedfbfd88a1e1b13d968d5526ffe14e6d6d (diff) | |
| parent | a3d82ef5d90b02a256087edf9c0124b51b059c18 (diff) | |
Merge pull request #576 from Subv/warnings1
Build: Fixed some MSVC warnings in various parts of the code.
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 833ff8273..3ba20f978 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -633,7 +633,7 @@ u32 RasterizerOpenGL::SetupConstBuffers(Maxwell::ShaderStage stage, GLuint progr state.Apply(); - return current_bindpoint + entries.size(); + return current_bindpoint + static_cast<u32>(entries.size()); } u32 RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, GLuint program, u32 current_unit, @@ -679,7 +679,7 @@ u32 RasterizerOpenGL::SetupTextures(Maxwell::ShaderStage stage, GLuint program, state.Apply(); - return current_unit + entries.size(); + return current_unit + static_cast<u32>(entries.size()); } void RasterizerOpenGL::BindFramebufferSurfaces(const Surface& color_surface, |