diff options
| author | bunnei <bunneidev@gmail.com> | 2016-05-07 17:24:16 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-05-07 17:24:16 -0400 |
| commit | 6abc6003f50cbaec555516bbaf8fce5bbecb2ff1 (patch) | |
| tree | 18ae5ec147f016b62e73d1de683d453c50407034 /src/video_core/renderer_opengl/gl_rasterizer.cpp | |
| parent | 8e9b33a34aab3f585d4855c2b69dbd76f1751be1 (diff) | |
| parent | 0a31e373f1728316b3dfed391ddcb99a474e4102 (diff) | |
Merge pull request #1718 from alex-laties/fixup-type-conversions
fixup simple type conversions where possible
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer.cpp')
| -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 519d81aeb..0b471dfd2 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -93,7 +93,7 @@ RasterizerOpenGL::RasterizerOpenGL() : shader_dirty(true) { state.Apply(); for (size_t i = 0; i < lighting_luts.size(); ++i) { - glActiveTexture(GL_TEXTURE3 + i); + glActiveTexture(static_cast<GLenum>(GL_TEXTURE3 + i)); glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA32F, 256, 0, GL_RGBA, GL_FLOAT, nullptr); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); |