diff options
| author |  bunnei | 2018-08-11 22:39:46 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-11 22:39:46 -0400 |
| commit | 9c977d221505fe6c604aea4f55c837cf10c555bb (patch) | |
| tree | 8dd01c0eba2e8df9b38805aebc42e22739b2f7c7 | |
| parent | Merge pull request #1024 from Subv/blend_gl (diff) | |
| parent | gl_rasterizer: Silence implicit truncation warning in SetupShaders() (diff) | |
| download | yuzu-9c977d221505fe6c604aea4f55c837cf10c555bb.tar.gz yuzu-9c977d221505fe6c604aea4f55c837cf10c555bb.tar.xz yuzu-9c977d221505fe6c604aea4f55c837cf10c555bb.zip | |
Merge pull request #1021 from lioncash/warn
gl_rasterizer: Silence implicit truncation warning in SetupShaders()
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 3646a1b1b..ea03e9b88 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -216,7 +216,7 @@ void RasterizerOpenGL::SetupShaders(u8* buffer_ptr, GLintptr buffer_offset) { | |||
| 216 | 216 | ||
| 217 | // Next available bindpoints to use when uploading the const buffers and textures to the GLSL | 217 | // Next available bindpoints to use when uploading the const buffers and textures to the GLSL |
| 218 | // shaders. The constbuffer bindpoint starts after the shader stage configuration bind points. | 218 | // shaders. The constbuffer bindpoint starts after the shader stage configuration bind points. |
| 219 | u32 current_constbuffer_bindpoint = uniform_buffers.size(); | 219 | u32 current_constbuffer_bindpoint = static_cast<u32>(uniform_buffers.size()); |
| 220 | u32 current_texture_bindpoint = 0; | 220 | u32 current_texture_bindpoint = 0; |
| 221 | 221 | ||
| 222 | for (size_t index = 0; index < Maxwell::MaxShaderProgram; ++index) { | 222 | for (size_t index = 0; index < Maxwell::MaxShaderProgram; ++index) { |