summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-11-29 00:36:02 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-11-29 00:36:02 +0100
commite6a0a30334c2b9d869ba3a1d2f189e2d6308c956 (patch)
tree298fda7b3a0f3665b950090bdca5b054a3719b7e /src
parentrenderer_opengl: Remove C casts (diff)
downloadyuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.tar
yuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.tar.gz
yuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.tar.bz2
yuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.tar.lz
yuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.tar.xz
yuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.tar.zst
yuzu-e6a0a30334c2b9d869ba3a1d2f189e2d6308c956.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index aa837eb95..bba16afaf 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -66,17 +66,12 @@ constexpr GLint PositionLocation = 0;
constexpr GLint TexCoordLocation = 1;
constexpr GLint ModelViewMatrixLocation = 0;
-/// Vertex structure that the drawn screen rectangles are composed of.
struct ScreenRectVertex {
- ScreenRectVertex(GLfloat x, GLfloat y, GLfloat u, GLfloat v) {
- position[0] = x;
- position[1] = y;
- tex_coord[0] = u;
- tex_coord[1] = v;
- }
+ constexpr ScreenRectVertex(GLfloat x, GLfloat y, GLfloat u, GLfloat v)
+ : position{{x, y}}, tex_coord{{u, v}} {}
- GLfloat position[2];
- GLfloat tex_coord[2];
+ std::array<GLfloat, 2> position;
+ std::array<GLfloat, 2> tex_coord;
};
/**
@@ -383,18 +378,18 @@ void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x,
static_cast<f32>(screen_info.texture.height);
}
- std::array<ScreenRectVertex, 4> vertices = {{
+ const std::array vertices = {
ScreenRectVertex(x, y, texcoords.top * scale_u, left * scale_v),
ScreenRectVertex(x + w, y, texcoords.bottom * scale_u, left * scale_v),
ScreenRectVertex(x, y + h, texcoords.top * scale_u, right * scale_v),
ScreenRectVertex(x + w, y + h, texcoords.bottom * scale_u, right * scale_v),
- }};
+ };
state.textures[0] = screen_info.display_texture;
state.framebuffer_srgb.enabled = screen_info.display_srgb;
state.AllDirty();
state.Apply();
- glNamedBufferSubData(vertex_buffer.handle, 0, sizeof(vertices), vertices.data());
+ glNamedBufferSubData(vertex_buffer.handle, 0, sizeof(vertices), std::data(vertices));
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
// Restore default state
state.framebuffer_srgb.enabled = false;