diff options
| author | bunnei <bunneidev@gmail.com> | 2015-09-21 21:29:55 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-09-21 21:29:55 -0400 |
| commit | 09f43c0975b303ca98072fbece37334b0d2b4e4b (patch) | |
| tree | 4590343a003cedb3116fbc2ecf1da83354e90c56 /src/video_core/renderer_opengl/renderer_opengl.cpp | |
| parent | ca5ea5142deec687e42f86add5026c1ade2c1093 (diff) | |
| parent | 543192e045d1b0866c353f1f6af2f3a3d81319c7 (diff) | |
Merge pull request #1160 from lioncash/clang
Silence some clang warnings
Diffstat (limited to 'src/video_core/renderer_opengl/renderer_opengl.cpp')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 22f261c68..f1313b54f 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -314,12 +314,12 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, * Draws a single texture to the emulator window, rotating the texture to correct for the 3DS's LCD rotation. */ void RendererOpenGL::DrawSingleScreenRotated(const TextureInfo& texture, float x, float y, float w, float h) { - std::array<ScreenRectVertex, 4> vertices = { + std::array<ScreenRectVertex, 4> vertices = {{ ScreenRectVertex(x, y, 1.f, 0.f), ScreenRectVertex(x+w, y, 1.f, 1.f), ScreenRectVertex(x, y+h, 0.f, 0.f), ScreenRectVertex(x+w, y+h, 0.f, 1.f), - }; + }}; state.texture_units[0].texture_2d = texture.handle; state.Apply(); |
