aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/renderer_opengl/renderer_opengl.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-09-21 11:29:48 -0700
committerGitHub <noreply@github.com>2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/video_core/renderer_opengl/renderer_opengl.h
parent2a910a6d883f2227edc74aacf5b93a58a3dea07c (diff)
parent0e3f0120a8ec2996e73bb6b7b6c9d7531f7a7eb1 (diff)
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/video_core/renderer_opengl/renderer_opengl.h')
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index 00e1044ab..87c556cff 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -5,14 +5,10 @@
#pragma once
#include <array>
-
#include <glad/glad.h>
-
#include "common/common_types.h"
#include "common/math_util.h"
-
#include "core/hw/gpu.h"
-
#include "video_core/renderer_base.h"
#include "video_core/renderer_opengl/gl_resource_manager.h"
#include "video_core/renderer_opengl/gl_state.h"
@@ -38,7 +34,6 @@ struct ScreenInfo {
class RendererOpenGL : public RendererBase {
public:
-
RendererOpenGL();
~RendererOpenGL() override;
@@ -67,15 +62,14 @@ private:
// Loads framebuffer from emulated memory into the display information structure
void LoadFBToScreenInfo(const GPU::Regs::FramebufferConfig& framebuffer,
- ScreenInfo& screen_info);
+ ScreenInfo& screen_info);
// Fills active OpenGL texture with the given RGB color.
- void LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color_b,
- const TextureInfo& texture);
+ void LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color_b, const TextureInfo& texture);
- EmuWindow* render_window; ///< Handle to render window
+ EmuWindow* render_window; ///< Handle to render window
- int resolution_width; ///< Current resolution width
- int resolution_height; ///< Current resolution height
+ int resolution_width; ///< Current resolution width
+ int resolution_height; ///< Current resolution height
OpenGLState state;
@@ -83,10 +77,14 @@ private:
OGLVertexArray vertex_array;
OGLBuffer vertex_buffer;
OGLShader shader;
- std::array<ScreenInfo, 2> screen_infos; ///< Display information for top and bottom screens respectively
+
+ /// Display information for top and bottom screens respectively
+ std::array<ScreenInfo, 2> screen_infos;
+
// Shader uniform location indices
GLuint uniform_modelview_matrix;
GLuint uniform_color_texture;
+
// Shader attribute input indices
GLuint attrib_position;
GLuint attrib_tex_coord;